[Gforge-commits] gforge/debian gforge-web-apache.postinst.dsfh-in, 1.7.2.1, 1.7.2.2

[lo-lan-do]

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

Modified Files:
      Tag: Branch_3_1
        gforge-web-apache.postinst.dsfh-in 
Log Message:
Cleaned up the Apache installation process so that it works more
generically with apache{,-perl,-ssl} flavours.  Also use
/etc/$flavour/conf.d/ directory (thus removing the hack that changed
the /etc/$flavour/httpd.conf file).


Index: gforge-web-apache.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-web-apache.postinst.dsfh-in,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- gforge-web-apache.postinst.dsfh-in  22 Nov 2003 17:23:43 -0000      1.7.2.1
+++ gforge-web-apache.postinst.dsfh-in  10 Jan 2004 21:43:58 -0000      1.7.2.2
@@ -49,8 +49,10 @@
 
         # Patch Apache configuration files
        /usr/lib/gforge/bin/install-apache.sh configure-files
-       [ -e /etc/apache/httpd.conf ] && propose_update_install 
/etc/apache/httpd.conf
-       [ -e /etc/apache-ssl/httpd.conf ] && propose_update_install 
/etc/apache-ssl/httpd.conf
+       for flavour in apache apache-perl apache-ssl ; do
+           [ -e /etc/$flavour/httpd.conf ] && propose_update_install 
/etc/$flavour/httpd.conf
+       done
+
        propose_update_install /etc/php4/apache/php.ini
        propose_update_install /etc/php4/cgi/php.ini