[Fusionforge-commits] r10049 - in trunk/gforge: debian debian/dsf-in etc packaging/install

[Roland Mas]

Author: lolando
Date: 2010-06-16 17:27:11 +0200 (Wed, 16 Jun 2010)
New Revision: 10049

Added:
   trunk/gforge/etc/httpd.conf-fhs
   trunk/gforge/etc/httpd.conf-opt
   trunk/gforge/etc/httpd.conf-usrlocal
Modified:
   trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/gforge/debian/rules
   trunk/gforge/packaging/install/web-apache2
Log:
Added master Apache config file, use it in Debian packaging

Modified: trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2010-06-16 15:26:56 UTC (rev 10048)
+++ trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2010-06-16 15:27:11 UTC (rev 10049)
@@ -40,15 +40,6 @@
 	add_onevar_mainconfile sys_show_source 0
 	add_onevar_mainconfile sys_force_login 0
 
-	if [ -f /usr/bin/cronolog ]; then  # this is the preferred location for debian
-	    add_onevar_mainconfile cronolog_path /usr/bin/cronolog
-	elif [ -f /usr/sbin/cronolog ]; then	   # this location is deprecated in debian
-	    add_onevar_mainconfile cronolog_path /usr/sbin/cronolog
-	else
-	    echo "can't find cronolog in usual places" >&2
-	    add_onevar_mainconfile cronolog_path /usr/bin/cronolog
-	fi
-
 	if [ ! -e /etc/@OLDPACKAGE@/ssl-cert.pem ] || [ ! -e /etc/@OLDPACKAGE@/ssl-cert.key ] ; then
 	    # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
 	    if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then
@@ -58,15 +49,6 @@
 	    # Right.  At this point, it should be safe to set the symlinks.
 	    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/@OLDPACKAGE@/ssl-cert.pem
 	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/@OLDPACKAGE@/ssl-cert.key
-	    if grep -q ^sys_use_ssl=false$ /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf \
-		&& grep -q ^sys_sslcrt=$ /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf \
-		&& grep -q ^sys_sslkey=$ /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf ; then
-		# Okay, previous installations failed to locate SSL certs
-		# and disabled SSL altogether.  Let's fix that
-		sed -i -e 's,^sys_use_ssl=false$,sys_use_ssl=true,' /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf 
-		sed -i -e 's,^sys_sslcrt=$,sys_sslcrt=/etc/@OLDPACKAGE@/ssl-cert.pem,' /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf 
-		sed -i -e 's,^sys_sslkey=$,sys_sslkey=/etc/@OLDPACKAGE@/ssl-cert.key,' /etc/@OLDPACKAGE@/@OLDPACKAGE at .conf
-	    fi
 	fi
 	
         @OLDPACKAGE at -config

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-06-16 15:26:56 UTC (rev 10048)
+++ trunk/gforge/debian/rules	2010-06-16 15:27:11 UTC (rev 10049)
@@ -160,6 +160,8 @@
 # Rename config files
 	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini
 	cp -r $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/gforge/etc/httpd.conf.d-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf.d
+	cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/gforge/etc/httpd.conf-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf
+
 # Remove those that need to be generated at install time
 	rm $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf.d/secrets.inc
 	rm $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf.d/vhost-list.inc

Added: trunk/gforge/etc/httpd.conf-fhs
===================================================================
--- trunk/gforge/etc/httpd.conf-fhs	                        (rev 0)
+++ trunk/gforge/etc/httpd.conf-fhs	2010-06-16 15:27:11 UTC (rev 10049)
@@ -0,0 +1,2 @@
+# Include all FusionForge-related configuration files
+Include /etc/gforge/httpd.conf.d/*.conf

Added: trunk/gforge/etc/httpd.conf-opt
===================================================================
--- trunk/gforge/etc/httpd.conf-opt	                        (rev 0)
+++ trunk/gforge/etc/httpd.conf-opt	2010-06-16 15:27:11 UTC (rev 10049)
@@ -0,0 +1,2 @@
+# Include all FusionForge-related configuration files
+Include /opt/fusionforge/etc/httpd.conf.d-opt/*.conf

Added: trunk/gforge/etc/httpd.conf-usrlocal
===================================================================
--- trunk/gforge/etc/httpd.conf-usrlocal	                        (rev 0)
+++ trunk/gforge/etc/httpd.conf-usrlocal	2010-06-16 15:27:11 UTC (rev 10049)
@@ -0,0 +1,2 @@
+# Include all FusionForge-related configuration files
+Include /etc/gforge/httpd.conf.d/*.conf

Modified: trunk/gforge/packaging/install/web-apache2
===================================================================
--- trunk/gforge/packaging/install/web-apache2	2010-06-16 15:26:56 UTC (rev 10048)
+++ trunk/gforge/packaging/install/web-apache2	2010-06-16 15:27:11 UTC (rev 10049)
@@ -3,3 +3,4 @@
 utils/install-apache.sh             usr/share/gforge/bin/
 utils/manage-apache-config.sh	    usr/share/gforge/bin/
 etc/httpd.conf.d-fhs		    usr/share/gforge/etc/
+etc/httpd.conf-fhs		    usr/share/gforge/etc/