[Gforge-commits] gforge/utils install-apache.sh,1.7,1.8

[cbayle]

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

Modified Files:
        install-apache.sh 
Log Message:
Better management of symlink in apache config


Index: install-apache.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/utils/install-apache.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- install-apache.sh   28 Mar 2004 20:23:39 -0000      1.7
+++ install-apache.sh   8 Apr 2004 15:55:30 -0000       1.8
@@ -167,9 +167,16 @@
                                /usr/sbin/modules-config $flavour enable mod_env
                                /usr/sbin/modules-config $flavour enable 
mod_vhost_alias
 
+                               set -x
+                               LINK=`ls -l 
/etc/$flavour/conf.d/gforge.httpd.conf | sed 's/.*-> \(.*\)$/\1/'`
+                               if [ "$LINK" != "$GFORGE_ETC_LIST" ] ; then 
+                                       echo Removing symlink
+                                       rm -f 
/etc/$flavour/conf.d/gforge.httpd.conf
+                               fi
                                if [ -d /etc/$flavour/conf.d ] ; then
-                                       [ ! -e 
/etc/$flavour/conf.d/gforge.httpd.conf ] && ln -s /etc/gforge/httpd.conf 
/etc/$flavour/conf.d/gforge.httpd.conf
+                                       [ ! -e 
/etc/$flavour/conf.d/gforge.httpd.conf ] && ln -s $GFORGE_ETC_LIST 
/etc/$flavour/conf.d/gforge.httpd.conf
                                fi
+                               set +x
                        fi
                        if [ -x /usr/sbin/$flavour ]; then
                                invoke-rc.d $flavour restart || true