Changeset 6173 for trunk/INSTALL/arquivos/scripts/bd.sh

Timestamp:

05/14/12 14:30:37 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2557 - Correcoes para melhorar o instalador e para deixar o Expresso completamente funcional.

File:

• trunk/INSTALL/arquivos/scripts/bd.sh (modified) (2 diffs)

trunk/INSTALL/arquivos/scripts/bd.sh

@@ -18 +18 @@
         
         rm -rf $DIR_PG*
-        su - postgres -c "export LANG=pt_BR.ISO-8859-1; initdb -E latin1 -D $DIR_PG"
+        su - postgres -c "env LANG=pt_BR.ISO-8859-1 initdb --encoding=LATIN1 -D $DIR_PG"
+        #su - postgres -c "export LANG=pt_BR.ISO-8859-1; initdb --encoding=LATIN1 -D $DIR_PG"
         #su - postgres -c "env LANG=LATIN1 initdb --locale=pt_BR.iso88591 --encoding=LATIN1 -D $DIR_PG"
-        sed -e "s/LDAP_DN/$LDAP_DN/g" -e "s/LDAP_PWD/$LDAP_PWD/g" -e "s/ORG/$ORG/g" -e "s/DOMAIN/$DOMAIN/g" $ARQS/expresso.dump > /tmp/expresso.dump
+        sed -e "s/LDAP_DN/$LDAP_DN/g" -e "s/LDAP_PWD/$LDAP_PWD/g" -e "s/ou=ORG/ou=$ORG/g" -e "s/DOMAIN/$DOMAIN/g" $ARQS/expresso.dump > /tmp/expresso.dump
         
 
         cp -f $PG_CONF $DIR_CONF/
         cp -f $PG_HBA $DIR_CONF/
-}
-
-bd_ubuntu1110 () {
-        DIR_PG=$1
-        PG_CONF=$2
-        PG_HBA=$3
-        DIR_CONF=$4
-        get_org
-        get_pass
-
-        rm -rf $DIR_PG*
-        su - postgres -c "env LANG=LATIN1 initdb --locale=pt_BR.iso88591 --encoding=LATIN1 -D $DIR_PG"
-        sed -e "s/LDAP_DN/$LDAP_DN/g" -e "s/LDAP_PWD/$LDAP_PWD/g" -e "s/ORG/$ORG/g" -e "s/DOMAIN/$DOMAIN/g" $ARQS/expresso.dump > /tmp/expresso.dump
-
-        cp -f $PG_CONF $DIR_CONF/
-        cp -f $PG_HBA $DIR_CONF/
 }
 
@@ -105 +90 @@
         chmod -R 770 $DIR_PG
 
-        bd_ubuntu1110 $DIR_PG $PG_CONF $PG_HBA $DIR_CONF
+        bd $DIR_PG $PG_CONF $PG_HBA $DIR_CONF
         #rm -f $DIR_PG/postgresql.conf
         #rm -f $DIR_PG/pg_hba.conf