Changeset 6261 for trunk/INSTALL/arquivos

Timestamp:

05/22/12 00:15:30 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2557 - Correcoes no instalador conforme sugestao no forum

Location:

trunk/INSTALL/arquivos/scripts

Files:

• aux.sh (modified) (2 diffs)
• bd.sh (modified) (3 diffs)
• http.sh (modified) (4 diffs)
• imap.sh (modified) (3 diffs)
• ini.sh (modified) (3 diffs)
• ldap.sh (modified) (3 diffs)
• smtp.sh (modified) (3 diffs)

trunk/INSTALL/arquivos/scripts/aux.sh

@@ -83 +83 @@
                         PSUEDONAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
                         REV=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
-                # Debian, Ubuntu e variantes, que possuem o LSB
+                # Debian, Ubuntu e variantes
                 elif [ -f /etc/debian_version ] ; then
-                        DIST=`lsb_release -si`
-                        PSEUDONAME=`lsb_release -sc`
-                        REV=`lsb_release -sr`
+                        # Verifica se o LSB esta instalado
+                        LSB=`which lsb_release`
+                        # Se nao estiver, configura no braco
+                        if [ -z "$LSB" ] ; then
+                                DIST="Debian"
+                                REV=`cat /etc/debian_version`
+                        # Se nao, usa o LSB. Ubuntu eh reconhecido aqui
+                        else
+                                DIST=`lsb_release -si`
+                                PSEUDONAME=`lsb_release -sc`
+                                REV=`lsb_release -sr`
+                        fi
                 # TODO: Validar do suse
                 elif [ -f /etc/SuSE-release ] ; then
@@ -97 +106 @@
         fi
 }
+
+qualSO
+echo $OSSTR
 
 validaSO ()

trunk/INSTALL/arquivos/scripts/bd.sh

@@ -64 +64 @@
 }
 
-bd_debian-squeeze ()
+bd_debian_6 ()
 {
         DIR_PG="/var/lib/postgresql/8.4/main"
@@ -99 +99 @@
 }
 
-bd_ubuntu-11.10 ()
+bd_ubuntu_1110 ()
 {
         DIR_PG="/var/lib/postgresql/9.1/main"
@@ -134 +134 @@
 }
 
-bd_rhel6 ()
+bd_rhel_6 ()
 {
         DIR_PG="/var/lib/pgsql"

trunk/INSTALL/arquivos/scripts/http.sh

@@ -66 +66 @@
 }
 
-http_debian-squeeze ()
+http_debian_6 ()
 {
         http_debian
@@ -84 +84 @@
 }
 
-http_ubuntu-11.10 ()
+http_ubuntu_1110 ()
 {
-        http_debian-squeeze
+        http_debian_6
         cp -a ubuntu/11.10/.htaccess $DIR_EXPRESSO
         cp -a ubuntu/11.10/etc/apache2/apache2.conf /etc/apache2/
@@ -109 +109 @@
 }
 
-http_rhel6 ()
+http_rhel_6 ()
 {
         http_rhel
@@ -122 +122 @@
 }
 
-#
-# TODO: Preciso de alguem que ajude a testar o SLES! Nao garanto que este codigo funcione
-#
-http_sles ()
-{
-        yast -i apache2 apache2-prefork apache2-mod_php5 \
-                php5 php5-devel php5-gd php5-imap php5-ldap php5-pgsql php5-mbstring php5-pear-auth \
-                zip unzip
-
-        cpexpresso "/srv/www/htdocs"
-        chown -R wwwrun:www /srv/www/htdocs/expresso /home/expressolivre
-
-        a2enmod rewrite
-}
-
-http_sles10 ()
-{
-        http_sles
-
-        cp -a sles10/etc/apache2/httpd.conf /etc/apache2/
-        cp -a sles10/etc/apache2/server-tuning.conf /etc/apache2/
-        cp -a sles10/etc/apache2/vhosts.d/expresso.conf /etc/apache2/vhosts.d/
-        cp -a sles10/etc/apache2/sysconfig.d/global.conf /etc/apache2/sysconfig.d/
-        cp -a sles10/etc/php5/apache2/php.ini /etc/php5/apache2/
-
-        rcapache2 restart
-}

trunk/INSTALL/arquivos/scripts/imap.sh

@@ -22 +22 @@
 }
 
-imap_debian-squeeze ()
+imap_debian_6 ()
 {
         apt-get -y install cyrus-admin-2.2 cyrus-clients-2.2 cyrus-common-2.2 cyrus-doc-2.2 cyrus-imapd-2.2 \
@@ -43 +43 @@
 }
 
-imap_ubuntu-11.10 ()
+imap_ubuntu_1110 ()
 {
-        imap_debian-squeeze
+        imap_debian_6
 }
-
 
 imap_rhel ()
@@ -56 +55 @@
 }
 
-imap_rhel6 ()
+imap_rhel_6 ()
 {
         imap_rhel

trunk/INSTALL/arquivos/scripts/ini.sh

@@ -20 +20 @@
 }
 
-ini_debian-lenny ()
+ini_debian_6 ()
 {
         ini_debian
 }
 
-ini_debian-squeeze ()
+ini_ubuntu_1110 ()
 {
-        ini_debian
-}
-
-ini_ubuntu-11.10 ()
-{
-        ini_debian-squeeze      
+        ini_debian_6    
 }
 
@@ -72 +67 @@
 }
 
-ini_rhel5 ()
-{
-        ini_rhel
-        # Deixa o SELinux permissivo
-        cp -f rhel/5/etc/selinux/config /etc/selinux/config
-        setenforce 0
-}
-
-ini_rhel6 ()
+ini_rhel_6 ()
 {
         ini_rhel
@@ -88 +75 @@
 }
 
-#
-# TODO: Preciso de alguem que ajude a testar o SLES! Nao garanto que este codigo funcione
-#
-ini_sles ()
-{
-        yast -i openssl vim
-}
-
-ini_sles10 ()
-{
-        ini_sles
-}
-
-ini_sles11 ()
-{
-        ini_sles
-}

trunk/INSTALL/arquivos/scripts/ldap.sh

@@ -46 +46 @@
 }
 
-ldap_debian-squeeze ()
+ldap_debian_6 ()
 {
         # BDB do Squeeze
@@ -55 +55 @@
 }
 
-ldap_ubuntu-11.10 ()
+ldap_ubuntu_1110 ()
 {
-        ldap_debian-squeeze
+        ldap_debian_6
 }
 
@@ -78 +78 @@
 }
 
-ldap_rhel6 ()
+ldap_rhel_6 ()
 {
         RHEL6=rhel/6/etc/openldap

trunk/INSTALL/arquivos/scripts/smtp.sh

@@ -28 +28 @@
 }
 
-smtp_rhel6 ()
+smtp_rhel_6 ()
 {
         RHEL6="rhel/6/etc/postfix"
@@ -43 +43 @@
 }
 
-smtp_debian-squeeze ()
+smtp_debian_6 ()
 {
         SQUEEZE="debian/squeeze/etc/postfix"
@@ -49 +49 @@
 }
 
-smtp_ubuntu-11.10 ()
+smtp_ubuntu_1110 ()
 {
-        smtp_debian-squeeze
+        smtp_debian_6
 }