[Fusionforge-commits] r14118 - in branches/Branch_5_1: . src/debian src/packaging/install

Roland Mas lolando at fusionforge.org
Mon Aug 15 11:52:58 CEST 2011


Author: lolando
Date: 2011-08-15 11:52:57 +0200 (Mon, 15 Aug 2011)
New Revision: 14118

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/src/debian/rules
   branches/Branch_5_1/src/packaging/install/web-apache2-vhosts
Log:
Ship httpd.vhosts template *only* as a conffile

Modified: branches/Branch_5_1/src/debian/rules
===================================================================
--- branches/Branch_5_1/src/debian/rules	2011-08-15 09:22:33 UTC (rev 14117)
+++ branches/Branch_5_1/src/debian/rules	2011-08-15 09:52:57 UTC (rev 14118)
@@ -196,6 +196,7 @@
 	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini
 	cp -r $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d
 	cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf
+	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(OLDPACKAGE)/templates/httpd.vhosts $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2-vhosts/etc/$(OLDPACKAGE)/templates/
 
 # Remove those that need to be generated at install time
 	rm $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d/secrets.inc

Modified: branches/Branch_5_1/src/packaging/install/web-apache2-vhosts
===================================================================
--- branches/Branch_5_1/src/packaging/install/web-apache2-vhosts	2011-08-15 09:22:33 UTC (rev 14117)
+++ branches/Branch_5_1/src/packaging/install/web-apache2-vhosts	2011-08-15 09:52:57 UTC (rev 14118)
@@ -2,4 +2,3 @@
 deb-specific/create-vhosts.sh       usr/share/@OLDPACKAGE@/bin/
 deb-specific/prepare-vhosts-file.pl usr/share/@OLDPACKAGE@/bin/
 deb-specific/@OLDPACKAGE at .logrotate       etc/logrotate.d/@OLDPACKAGE at -web-apache2
-etc/templates/httpd.vhosts          etc/@OLDPACKAGE@/templates/




More information about the Fusionforge-commits mailing list