[Gforge-commits] gforge/deb-specific gforge-config, 1.4, 1.5 prepare-vhosts-file.pl, 1.1, 1.2

[cbayle]

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

Modified Files:
        gforge-config prepare-vhosts-file.pl 
Log Message:
Now use setup in debian package
be warned this is experimental


Index: gforge-config
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/gforge-config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gforge-config       10 Jun 2003 10:13:06 -0000      1.4
+++ gforge-config       4 Mar 2004 23:53:05 -0000       1.5
@@ -5,13 +5,14 @@
 # Parse all template files and expand them into real files
 # Roland Mas, debian-sf (Sourceforge for Debian)
 
-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
+#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
 
 [ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc
 [ -f /etc/gforge/httpd.conf ] && chmod 644 /etc/gforge/httpd.conf
@@ -19,5 +20,7 @@
 [ -f /etc/gforge/database.inc ] && chown gforge:gforge /etc/gforge/database.inc
 [ -f /etc/gforge/database.inc ] && chmod 640 /etc/gforge/database.inc
 
-chown gforge:gforge /etc/gforge/local.pl
-chmod 640 /etc/gforge/local.pl
+[ -f /etc/gforge/local.pl ] && chown gforge:gforge /etc/gforge/local.pl
+[ -f /etc/gforge/local.pl ] && chmod 640 /etc/gforge/local.pl
+
+[ -f /etc/gforge/templates/httpd.conf.template ] && rm -f 
/etc/gforge/templates/*.template || true

Index: prepare-vhosts-file.pl
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/prepare-vhosts-file.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prepare-vhosts-file.pl      7 Sep 2003 22:10:06 -0000       1.1
+++ prepare-vhosts-file.pl      4 Mar 2004 23:53:05 -0000       1.2
@@ -20,7 +20,7 @@
 
 &db_connect;
 
-$ifile = '/etc/gforge/templates/httpd.vhosts.template' ;
+$ifile = '/etc/gforge/templates/httpd.vhosts' ;
 $ofile = '/var/lib/gforge/etc/httpd.vhosts' ;
 
 open (IFILE, $ifile)