[Fusionforge-commits] r14117 - in branches/Branch_5_1: . src/deb-specific src/debian src/packaging/install
Roland Mas
lolando at fusionforge.org
Mon Aug 15 11:22:33 CEST 2011
Author: lolando
Date: 2011-08-15 11:22:33 +0200 (Mon, 15 Aug 2011)
New Revision: 14117
Modified:
branches/Branch_5_1/
branches/Branch_5_1/src/deb-specific/prepare-vhosts-file.pl
branches/Branch_5_1/src/debian/changelog
branches/Branch_5_1/src/packaging/install/web-apache2-vhosts
Log:
Ship httpd.vhosts template as a conffile, so as not to overwrite local changes on upgrade
Modified: branches/Branch_5_1/src/deb-specific/prepare-vhosts-file.pl
===================================================================
--- branches/Branch_5_1/src/deb-specific/prepare-vhosts-file.pl 2011-08-12 15:30:57 UTC (rev 14116)
+++ branches/Branch_5_1/src/deb-specific/prepare-vhosts-file.pl 2011-08-15 09:22:33 UTC (rev 14117)
@@ -12,7 +12,7 @@
&db_connect ;
-$ifile = '/usr/share/gforge/etc/templates/httpd.vhosts' ;
+$ifile = '/etc/gforge/templates/httpd.vhosts' ;
$ofile = '/var/lib/gforge/etc/templates/httpd.vhosts' ;
open (IFILE, $ifile)
Modified: branches/Branch_5_1/src/debian/changelog
===================================================================
--- branches/Branch_5_1/src/debian/changelog 2011-08-12 15:30:57 UTC (rev 14116)
+++ branches/Branch_5_1/src/debian/changelog 2011-08-15 09:22:33 UTC (rev 14117)
@@ -6,8 +6,10 @@
[ Roland Mas ]
* Added Olivier to Uploaders.
+ * Ship httpd.vhosts template as a conffile, so as not to overwrite local
+ changes.
- -- Roland Mas <lolando at debian.org> Fri, 12 Aug 2011 13:53:36 +0200
+ -- Roland Mas <lolando at debian.org> Mon, 15 Aug 2011 11:05:03 +0200
fusionforge (5.1-3) unstable; urgency=low
Modified: branches/Branch_5_1/src/packaging/install/web-apache2-vhosts
===================================================================
--- branches/Branch_5_1/src/packaging/install/web-apache2-vhosts 2011-08-12 15:30:57 UTC (rev 14116)
+++ branches/Branch_5_1/src/packaging/install/web-apache2-vhosts 2011-08-15 09:22:33 UTC (rev 14117)
@@ -2,3 +2,4 @@
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