[Gforge-commits] gforge/utils install-apache.sh,1.4,1.5

[cbayle]

Update of /cvsroot/gforge/gforge/utils
In directory db.perdue.net:/tmp/cvs-serv8641/utils

Modified Files:
        install-apache.sh 
Log Message:
Now use setup in debian package
be warned this is experimental


Index: install-apache.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/utils/install-apache.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- install-apache.sh   18 Jan 2004 01:56:34 -0000      1.4
+++ install-apache.sh   4 Mar 2004 23:53:06 -0000       1.5
@@ -103,7 +103,7 @@
        # Make sure Apache sees us
        for apacheconffile in $APACHE_ETC_LIST
        do
-               APACHE_ETC_DIR=`basename $apacheconffile`
+               APACHE_ETC_DIR=`dirname $apacheconffile`
                if [ -d "$APACHE_ETC_DIR/conf.d" ]
                then
                        # New apache conf       
@@ -132,10 +132,11 @@
                fi
        done
        # Make sure pgsql, ldap and gd are enabled in the PHP config files
+       
        for phpconffile in $PHP_ETC_LIST
        do
                cp -a $phpconffile $phpconffile.gforge-new
-               if [ -f $etcphp4apache/php.ini.gforge-new ]; then
+               if [ -f $phpconffile.gforge-new ]; then
                        if ! grep -q 
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" 
$phpconffile.gforge-new; then
                                echo "Enabling pgsql in $phpconffile"
                                echo "extension=pgsql.so" >> 
$phpconffile.gforge-new
@@ -197,20 +198,26 @@
 
     setup)
        $0 configure-files
-       for apacheconffile in $APACHE_ETC_LIST
+       for conffile in $APACHE_ETC_LIST $PHP_ETC_LIST
        do
-               cp $apacheconffile $apacheconffile.gforge-old
-               mv $apacheconffile.gforge-new $apacheconffile
+               if [ -f $conffile.gforge-new ] 
+               then
+                       cp $conffile $conffile.gforge-old
+                       mv $conffile.gforge-new $conffile
+               fi
        done
        $0 configure
        ;;
 
     cleanup)
        $0 purge-files
-       for apacheconffile in $APACHE_ETC_LIST
+       for conffile in $APACHE_ETC_LIST $PHP_ETC_LIST
        do
-               cp $apacheconffile $apacheconffile.gforge-old
-               mv $apacheconffile.gforge-new $apacheconffile
+               if [ -f $conffile.gforge-new ] 
+               then
+                       cp $conffile $conffile.gforge-old
+                       mv $conffile.gforge-new $conffile
+               fi
        done
        $0 purge
        ;;