Changeset 5838 for trunk/INSTALL/arquivos/scripts/http.sh

Timestamp:

03/27/12 17:37:42 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2557 - Corrigido problema no script do BD e HTTP

File:

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

trunk/INSTALL/arquivos/scripts/http.sh

@@ -18 +18 @@
         HEADER_PWD=`php $ARQS/scripts/pass.php $LDAP_PWD`
         sed -e "s/HEADER_PWD/$HEADER_PWD/g" -e "s|EXPRESSO_DIR|$DIR_EXPRESSO|g" $ARQS/header.inc.php > $DIR_EXPRESSO/header.inc.php
-<<<<<<< .mine
-        chmod 640 $DIR_EXPRESSO/header.inc.php
+        #chmod 640 $DIR_EXPRESSO/header.inc.php
         
-=======
-        chmod 640 $DIR_EXPRESSO/header.inc.php
-        
-        /etc/init.d/apache2 restart
->>>>>>> .r5824
         # Requisita o domino para corrigir o hosts do servidor, utilizado pelo apache
         get_org
@@ -70 +64 @@
 }
 
-http_ubuntu-11.10()
+http_ubuntu-11.10 ()
 {
         http_debian-squeeze
         cp -a ubuntu/11.10/.htaccess $DIR_EXPRESSO
         cp -a ubuntu/11.10/etc/apache2/apache2.conf /etc/apache2/
+
         /etc/init.d/apache2 restart
 }