[Fusionforge-commits] r14181 - in trunk: . src/debian src/etc src/etc/templates src/packaging/install

Roland Mas lolando at fusionforge.org
Mon Aug 22 17:36:01 CEST 2011


Author: lolando
Date: 2011-08-22 17:36:01 +0200 (Mon, 22 Aug 2011)
New Revision: 14181

Added:
   trunk/src/etc/templates/
   trunk/src/etc/templates/httpd.vhosts
Modified:
   trunk/
   trunk/src/debian/rules
   trunk/src/packaging/install/web-apache2-vhosts
Log:
Reinstated a template for the httpd.vhosts file

Modified: trunk/src/debian/rules
===================================================================
--- trunk/src/debian/rules	2011-08-22 15:34:12 UTC (rev 14180)
+++ trunk/src/debian/rules	2011-08-22 15:36:01 UTC (rev 14181)
@@ -217,7 +217,6 @@
 	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/usr/share/$(OLDPACKAGE)/etc/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

Added: trunk/src/etc/templates/httpd.vhosts
===================================================================
--- trunk/src/etc/templates/httpd.vhosts	                        (rev 0)
+++ trunk/src/etc/templates/httpd.vhosts	2011-08-22 15:36:01 UTC (rev 14181)
@@ -0,0 +1,17 @@
+<VirtualHost *:80>
+	ServerName {vhost_name}
+	VirtualDocumentRoot {docdir}
+        VirtualScriptAlias {cgidir}
+        <Directory {gforge_chroot}{groupdir}>
+               Options Indexes FollowSymlinks
+               AllowOverride All
+               order allow,deny
+               allow from all
+       </Directory>
+  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
+  CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+  # Ensure that we don't try to use SSL on SSL Servers
+  <IfModule apache_ssl.c>
+    SSLDisable
+  </IfModule>
+</VirtualHost>

Modified: trunk/src/packaging/install/web-apache2-vhosts
===================================================================
--- trunk/src/packaging/install/web-apache2-vhosts	2011-08-22 15:34:12 UTC (rev 14180)
+++ trunk/src/packaging/install/web-apache2-vhosts	2011-08-22 15:36:01 UTC (rev 14181)
@@ -1,3 +1,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/
\ No newline at end of file




More information about the Fusionforge-commits mailing list