[Gforge-commits] gforge setup,1.18,1.19 ChangeLog,1.340,1.341

[cbayle]

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

Modified Files:
        setup ChangeLog 
Log Message:
Better management of symlink in apache config


Index: setup
===================================================================
RCS file: /cvsroot/gforge/gforge/setup,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- setup       25 Mar 2004 23:54:10 -0000      1.18
+++ setup       8 Apr 2004 15:55:29 -0000       1.19
@@ -39,7 +39,7 @@
        DEFAULTldap_base_dn="dc=`echo $DEFAULTdomain_name | sed 's/\./,dc=/g'`"
        DEFAULTldap_web_add_password=$(dd if=/dev/urandom count=256 bs=1 2> 
/dev/null | md5sum | cut -b1-8)
        DEFAULTcgidir=$CGIDIR
-       DEFAULTcronolog_path=`type cronolog | cut -d' ' -f3`
+       DEFAULTcronolog_path=`which cronolog || echo /usr/bin/cronolog`
        DEFAULTsys_path_to_jpgraph=/usr/share/jpgraph/
        DEFAULTsys_path_to_cvsweb=/usr/lib/gforge/bin/
        DEFAULTgforge_chroot=$CHROOT
@@ -185,7 +185,7 @@
        APACHECONF=/etc/apache/httpd.conf
        GFORGE_ETC_SEARCH=$HTTPDCONF
        export GFORGE_ETC_SEARCH
-       if [ -f $APACHECONF ] ; then
+       if [ -f $APACHECONF -a -f $BINDIR/install-apache.sh ] ; then
                if [ ! -f /etc/apache/conf.d/gforge.httpd.conf ] ; then
                        if ! grep -q "^Include $GFORGE_ETC_SEARCH" $APACHECONF 
; then
                                $BINDIR/install-apache.sh setup
@@ -193,7 +193,17 @@
                                echo "Found Include $GFORGE_ETC_SEARCH in 
$APACHECONF"
                        fi
                else
-                       echo "Found /etc/apache/conf.d/gforge.httpd.conf"
+                       LINK=`ls -l /etc/apache/conf.d/gforge.httpd.conf | sed 
's/.*-> \(.*\)$/\1/'`
+                       if [ "$LINK" != "$GFORGE_ETC_SEARCH" ] ; then
+                               echo Need to readjust Symlink
+                               $BINDIR/install-apache.sh setup
+                       fi
+                       if ! grep -q "^Include $GFORGE_ETC_SEARCH" $APACHECONF 
; then
+                               echo "Found 
/etc/apache/conf.d/gforge.httpd.conf"
+                       else 
+                               # There is a link and an include
+                               $BINDIR/install-apache.sh setup
+                       fi
                fi
        fi
 }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gforge/gforge/ChangeLog,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- ChangeLog   6 Apr 2004 16:02:03 -0000       1.340
+++ ChangeLog   8 Apr 2004 15:55:29 -0000       1.341
@@ -1,3 +1,10 @@
+2004-04-08
+       
+       * Better management of symlink in apache config (install-apache.sh and
+       setup)
+       * sys_localinc variable has now priority on all others local.inc
+       (pre.php). This allow to make easy multiple gforge config on the same 
box
+
 2004-04-06  Tom Copeland <address@hidden>
 
        * www/include/languages/Base.tab: Fixed stats_user_graph typo.