[Gforge-commits] gforge/deb-specific gforge-config,1.6,1.7

[cbayle]

Update of /cvsroot/gforge/gforge/deb-specific
In directory db.perdue.net:/tmp/cvs-serv13858/deb-specific

Modified Files:
        gforge-config 
Log Message:
Some changes for a better apache2 support


Index: gforge-config
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/gforge-config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gforge-config       9 May 2004 18:15:38 -0000       1.6
+++ gforge-config       25 Oct 2004 14:39:51 -0000      1.7
@@ -4,15 +4,18 @@
 #
 # Parse all template files and expand them into real files
 # Roland Mas, debian-sf (Sourceforge for Debian)
+#
+# For apache2 we have to remove the Listen 80 directive 
+# This is to test if apache2 is started and listen on port 80
+#
+[ -f /etc/default/apache2 ] && . /etc/default/apache2
+if [ "x$NO_START" == "x0" ]
+then
+       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system LDAP 
-nolisten80
+else
+       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system LDAP -listen80
+fi     
 
-#filenames="local.inc database.inc httpd.conf httpd.secrets local.pl 
httpd.common"
-#for i in $filenames ; do
-#    [ -f /etc/gforge/templates/${i}.template ] && \
-#    /usr/lib/gforge/bin/fill-in-the-blanks.pl \
-#      /etc/gforge/templates/${i}.template \
-#      /etc/gforge/$i
-#done
-/usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system LDAP
 
 [ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc
 [ -f /etc/gforge/httpd.conf ] && chmod 644 /etc/gforge/httpd.conf