[Fusionforge-commits] r8858 - in trunk/gforge: . deb-specific debian etc/httpd.d plugins/mediawiki/etc/httpd.d

Christian Bayle cbayle at libremir.placard.fr.eu.org
Wed Feb 24 01:55:27 CET 2010


Author: cbayle
Date: 2010-02-24 01:55:26 +0100 (Wed, 24 Feb 2010)
New Revision: 8858

Added:
   trunk/gforge/etc/httpd.d/060maindirhttp.vhost
   trunk/gforge/etc/httpd.d/06zmaindirhttp.vhost
   trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl
   trunk/gforge/etc/httpd.d/200list.vhost
   trunk/gforge/etc/httpd.d/20zlist.vhost
   trunk/gforge/etc/httpd.d/21list.vhost.ssl
   trunk/gforge/etc/httpd.d/40project.vhost
   trunk/gforge/etc/httpd.d/55dnsalias.vhost
   trunk/gforge/etc/httpd.d/99maindirhttp
Removed:
   trunk/gforge/etc/httpd.d/07maindirhttp.ssl
   trunk/gforge/etc/httpd.d/21list.ssl
   trunk/gforge/etc/httpd.d/40virtualhost
   trunk/gforge/etc/httpd.d/55vhost
Modified:
   trunk/gforge/deb-specific/gforge-config
   trunk/gforge/debian/changelog
   trunk/gforge/etc/httpd.d/01common
   trunk/gforge/etc/httpd.d/01common.ssl
   trunk/gforge/etc/httpd.d/05maindirauth
   trunk/gforge/etc/httpd.d/06maindirhttp
   trunk/gforge/etc/httpd.d/20list
   trunk/gforge/etc/httpd.d/61plugin-scmdarcs
   trunk/gforge/etc/httpd.d/61plugin-scmgit
   trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
   trunk/gforge/setup
Log:
Reorganize http config


Modified: trunk/gforge/deb-specific/gforge-config
===================================================================
--- trunk/gforge/deb-specific/gforge-config	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/deb-specific/gforge-config	2010-02-24 00:55:26 UTC (rev 8858)
@@ -6,12 +6,13 @@
 # For apache2 we have to remove the Listen 80 directive 
 # This is to test if apache2 is started and listen on port 80
 #
+# -dovhost will create vhosts
 [ -f /etc/default/apache2 ] && . /etc/default/apache2
 if [ "x$NO_START" = "x0" ]
 then
-	/usr/share/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -nolisten80
+	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -nolisten80
 else
-	/usr/share/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -listen80
+	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -listen80
 fi	
 
 [ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/debian/changelog	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,4 +1,4 @@
-fusionforge (4.8.56+trunk20100219-1) experimental; urgency=low
+fusionforge (4.8.59-1) experimental; urgency=low
 
   * New snapshot from upstream SVN (trunk).
   * Renamed source package.

Modified: trunk/gforge/etc/httpd.d/01common
===================================================================
--- trunk/gforge/etc/httpd.d/01common	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/01common	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,3 +1,4 @@
+# 01common begin
 <Files .htaccess>
   order allow,deny
   deny from all
@@ -11,3 +12,4 @@
   ## block web access to CVS directories.
   deny from all
 </Directory>
+# 01common end

Modified: trunk/gforge/etc/httpd.d/01common.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/01common.ssl	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/01common.ssl	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1 +1,3 @@
+# 01common.ssl begin
 NameVirtualHost *:443
+# 01common.ssl end

Modified: trunk/gforge/etc/httpd.d/05maindirauth
===================================================================
--- trunk/gforge/etc/httpd.d/05maindirauth	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/05maindirauth	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,6 +1,4 @@
-#
-# Main host
-#
+# 05maindirauth begin
 <Directory {usr_share_gforge}/www>
   Options Indexes FollowSymlinks
   AllowOverride All
@@ -25,3 +23,4 @@
   # apache's error_log. So make sure error_log isn't defined in php.ini (/etc/php5/apache/php.ini)
   ##php_admin_value error_log ''
 </Directory>
+# 05maindirauth end

Added: trunk/gforge/etc/httpd.d/060maindirhttp.vhost
===================================================================
--- trunk/gforge/etc/httpd.d/060maindirhttp.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/060maindirhttp.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,18 @@
+# 060maindirhttp.vhost begin
+<VirtualHost *:80>
+	ServerName {domain_name}
+	ServerAlias www.{domain_name}
+	ServerAdmin {server_admin}
+	DocumentRoot {usr_share_gforge}/www
+	#
+	# Apache 1.3
+	# User {sys_apache_user}
+	# Group {sys_apache_group}
+	#
+	# Apache 2 apache2-mpm-perchild
+	# AssignUserID {sys_apache_user} {sys_apache_group}
+	# Apache 2
+	# <IfModule mod_suexec.c>
+	#	SuexecUserGroup {sys_apache_user} {sys_apache_group}
+	# </IfModule>
+# 060maindirhttp.vhost end

Modified: trunk/gforge/etc/httpd.d/06maindirhttp
===================================================================
--- trunk/gforge/etc/httpd.d/06maindirhttp	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/06maindirhttp	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,18 +1,4 @@
-# HTTP
-<VirtualHost *:80>
-	ServerName {domain_name}
-	ServerAlias www.{domain_name}
-	ServerAdmin {server_admin}
-	DocumentRoot {usr_share_gforge}/www
-	# Apache 1.3
-	#User {sys_apache_user}
-	#Group {sys_apache_group}
-	# Apache 2 apache2-mpm-perchild
-	#AssignUserID {sys_apache_user} {sys_apache_group}
-	# Apache 2 but this is not the same
-	#<IfModule mod_suexec.c>
-	#	SuexecUserGroup {sys_apache_user} {sys_apache_group}
-	#</IfModule>
+# 06maindirhttp begin
 	DirectoryIndex index.html index.php
 	<IfModule mod_userdir.c>
 		UserDir disabled
@@ -36,25 +22,18 @@
 
 	# 404 Error document
 	ErrorDocument 404 {sys_urlprefix}404.php
-	LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
 
-	# GForge without the DNS delegation
+	# FusionForge without the DNS delegation
 	# Project home pages are in a virtual /www/<group> location
-#	AliasMatch ^/www/([^/]*)/(.*) {gforge_chroot}{groupdir}/$1/htdocs/$2
-#	ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) {gforge_chroot}{groupdir}/$1/cgi-bin/$2
-#	<Directory {gforge_chroot}{groupdir}>
-#		Options Indexes FollowSymlinks
-#		AllowOverride All
-#		order allow,deny
-#		allow from all
-#	</Directory>
+	#	AliasMatch ^/www/([^/]*)/(.*) {gforge_chroot}{groupdir}/$1/htdocs/$2
+	#	ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) {gforge_chroot}{groupdir}/$1/cgi-bin/$2
+	#	<Directory {gforge_chroot}{groupdir}>
+	#		Options Indexes FollowSymlinks
+	#		AllowOverride All
+	#		order allow,deny
+	#		allow from all
+	#	</Directory>
 
-	# Ensure that we don't try to use SSL on SSL Servers
-	<IfModule apache_ssl.c>
-		SSLDisable
-	</IfModule>
-
         Alias {sys_urlprefix}fckeditor/ /usr/share/fckeditor/
         <Directory "/usr/share/fckeditor/">
             Options Indexes MultiViews FollowSymLinks
@@ -63,8 +42,8 @@
 	    allow from all
         </Directory>
 
-	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
-	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php {usr_share_gforge}/www/plugins/mediawiki/index.php
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/wikidata/$1/images/$2
 	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
 
         Alias {sys_urlprefix}anonscm/ {var_lib_gforge}/chroot/scmrepos/
@@ -85,9 +64,4 @@
 	    ProxyPass http://127.0.0.1:8081/
 	    ProxyPassReverse http://127.0.0.1:8081/
 	</Location>
-
-        RewriteEngine on
-        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-        RewriteRule .* - [F]
-</VirtualHost>
-
+# 06maindirhttp end

Added: trunk/gforge/etc/httpd.d/06zmaindirhttp.vhost
===================================================================
--- trunk/gforge/etc/httpd.d/06zmaindirhttp.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/06zmaindirhttp.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,15 @@
+# 06zmaindirhttp.vhost begin
+	Alias {sys_urlprefix} {usr_share_gforge}/www/
+	LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge.log" fusionforge
+
+	# Ensure that we don't try to use SSL on SSL Servers
+	<IfModule apache_ssl.c>
+		SSLDisable
+	</IfModule>
+
+        RewriteEngine on
+        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+        RewriteRule .* - [F]
+</VirtualHost>
+# 06zmaindirhttp.vhost end

Deleted: trunk/gforge/etc/httpd.d/07maindirhttp.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,95 +0,0 @@
-# HTTPS
-<VirtualHost *:443>
-	ServerName {domain_name}
-	ServerAlias www.{domain_name}
-	ServerAdmin {server_admin}
-	# Apache 1.3
-	#User {sys_apache_user}
-	#Group {sys_apache_group}
-	# Apache 2 apache2-mpm-perchild
-	#AssignUserID {sys_apache_user} {sys_apache_group}
-	# Apache 2
-	<IfModule mod_suexec.c>
-		SuexecUserGroup {sys_apache_user} {sys_apache_group}
-	</IfModule>
-	DocumentRoot {usr_share_gforge}/www
-	DirectoryIndex index.html index.php
-	<IfModule mod_userdir.c>
-		UserDir disabled
-	</IfModule>
-
-	php_admin_value default_charset "UTF-8"
-
-	<Directory {usr_share_gforge}/www>
-		Include   {gforge_etc}/httpd.secrets
-	</Directory>
-
-	ScriptAliasMatch ^{sys_urlprefix}plugins/([^/]*)/cgi-bin/(.*) {usr_share_gforge}/plugins/$1/cgi-bin/$2
-
-	# Projects and Users script
-	<Location {sys_urlprefix}projects>
-		ForceType application/x-httpd-php
-	</Location>
-	<Location {sys_urlprefix}users>
-		ForceType application/x-httpd-php
-	</Location>
-
-	# 404 Error document
-	ErrorDocument 404 {sys_urlprefix}404.php
-	LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
-
-	<IfModule mod_ssl.c>
-		SSLEngine on
-		SSLCertificateFile {sys_sslcrt}
-		SSLCertificateKeyFile {sys_sslkey}
-		<Files ~ "\.(cgi|shtml)$">
-			SSLOptions +StdEnvVars
-		</Files>
-		<Directory "/usr/lib/cgi-bin">
-			SSLOptions +StdEnvVars
-		</Directory>
-		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-	</IfModule>
-
-	<IfModule apache_ssl.c>
-		SSLEnable
-		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-	</IfModule>
-
-        Alias {sys_urlprefix}fckeditor/ /usr/share/fckeditor/
-        <Directory "/usr/share/fckeditor/">
-            Options Indexes MultiViews FollowSymLinks
-            AllowOverride None
-            Order allow,deny
-	    allow from all
-        </Directory>
-
-	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
-	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
-	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
-
-        Alias {sys_urlprefix}anonscm/ {var_lib_gforge}/chroot/scmrepos/
-	Alias {sys_urlprefix} {usr_share_gforge}/www/
-
-        <DirectoryMatch {var_lib_gforge}/chroot/scmrepos/[^/]*>
-            Options -Indexes
-        </DirectoryMatch>
-        <DirectoryMatch {var_lib_gforge}/chroot/scmrepos/[^/]*/.*>
-            Options +Indexes
-        </DirectoryMatch>
-
-	<Proxy http://127.0.0.1:8081/*>
-	    Allow from all
-	</Proxy>
-
-	<Location {sys_urlprefix}scm/loggerhead/>
-	    ProxyPass http://127.0.0.1:8081/
-	    ProxyPassReverse http://127.0.0.1:8081/
-	</Location>
-
-        RewriteEngine on
-        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-        RewriteRule .* - [F]
-</VirtualHost>
-

Copied: trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl (from rev 8857, trunk/gforge/etc/httpd.d/07maindirhttp.ssl)
===================================================================
--- trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,107 @@
+# 07maindirhttp.vhost.ssl begin
+<VirtualHost *:443>
+	ServerName {domain_name}
+	ServerAlias www.{domain_name}
+	ServerAdmin {server_admin}
+	DocumentRoot {usr_share_gforge}/www
+	#
+	# Apache 1.3
+	# User {sys_apache_user}
+	# Group {sys_apache_group}
+	#
+	# Apache 2 apache2-mpm-perchild
+	# AssignUserID {sys_apache_user} {sys_apache_group}
+	# Apache 2
+	# <IfModule mod_suexec.c>
+	#	SuexecUserGroup {sys_apache_user} {sys_apache_group}
+	# </IfModule>
+	##### COPY of 06maindirhttp begin #####
+	DirectoryIndex index.html index.php
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+
+	php_admin_value default_charset "UTF-8"
+
+	<Directory {usr_share_gforge}/www>
+		Include   {gforge_etc}/httpd.secrets
+	</Directory>
+
+	ScriptAliasMatch ^{sys_urlprefix}plugins/([^/]*)/cgi-bin/(.*) {usr_share_gforge}/plugins/$1/cgi-bin/$2
+
+	# Projects and Users script
+	<Location {sys_urlprefix}projects>
+		ForceType application/x-httpd-php
+	</Location>
+	<Location {sys_urlprefix}users>
+		ForceType application/x-httpd-php
+	</Location>
+
+	# 404 Error document
+	ErrorDocument 404 {sys_urlprefix}404.php
+
+	# FusionForge without the DNS delegation
+	# Project home pages are in a virtual /www/<group> location
+	#	AliasMatch ^/www/([^/]*)/(.*) {gforge_chroot}{groupdir}/$1/htdocs/$2
+	#	ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) {gforge_chroot}{groupdir}/$1/cgi-bin/$2
+	#	<Directory {gforge_chroot}{groupdir}>
+	#		Options Indexes FollowSymlinks
+	#		AllowOverride All
+	#		order allow,deny
+	#		allow from all
+	#	</Directory>
+
+        Alias {sys_urlprefix}fckeditor/ /usr/share/fckeditor/
+        <Directory "/usr/share/fckeditor/">
+            Options Indexes MultiViews FollowSymLinks
+            AllowOverride None
+            Order allow,deny
+	    allow from all
+        </Directory>
+
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
+
+        Alias {sys_urlprefix}anonscm/ {var_lib_gforge}/chroot/scmrepos/
+	Alias {sys_urlprefix} {usr_share_gforge}/www/
+
+        <DirectoryMatch {var_lib_gforge}/chroot/scmrepos/[^/]*>
+            Options -Indexes
+        </DirectoryMatch>
+        <DirectoryMatch {var_lib_gforge}/chroot/scmrepos/[^/]*/.*>
+            Options +Indexes
+        </DirectoryMatch>
+
+	<Proxy http://127.0.0.1:8081/*>
+	    Allow from all
+	</Proxy>
+
+	<Location {sys_urlprefix}scm/loggerhead/>
+	    ProxyPass http://127.0.0.1:8081/
+	    ProxyPassReverse http://127.0.0.1:8081/
+	</Location>
+	##### COPY of 06maindirhttp end #####
+	<IfModule mod_ssl.c>
+		SSLEngine on
+		SSLCertificateFile {sys_sslcrt}
+		SSLCertificateKeyFile {sys_sslkey}
+		<Files ~ "\.(cgi|shtml)$">
+			SSLOptions +StdEnvVars
+		</Files>
+		<Directory "/usr/lib/cgi-bin">
+			SSLOptions +StdEnvVars
+		</Directory>
+		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	</IfModule>
+
+	<IfModule apache_ssl.c>
+		SSLEnable
+		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	</IfModule>
+
+        RewriteEngine on
+        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+        RewriteRule .* - [F]
+</VirtualHost>
+# 07maindirhttp.vhost.ssl end

Added: trunk/gforge/etc/httpd.d/200list.vhost
===================================================================
--- trunk/gforge/etc/httpd.d/200list.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/200list.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,4 @@
+# 200list.vhost begin
+<VirtualHost *:80>
+	ServerName {lists_host}
+# 200list.vhost end

Modified: trunk/gforge/etc/httpd.d/20list
===================================================================
--- trunk/gforge/etc/httpd.d/20list	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/20list	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,35 +1,18 @@
-#
-# List host
-#
-# HTTP
-<VirtualHost *:80>
-  ServerName {lists_host}
-  AddHandler cgi-script .cgi
+# 20list begin
+	AddHandler cgi-script .cgi
 
-  ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
-  ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+	ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+	ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
 
-  Alias /pipermail /var/lib/mailman/archives/public
-  <Directory /var/lib/mailman/archives/public>
-    AllowOverride Options
-    Options FollowSymLinks
-  </Directory>
+	Alias /pipermail /var/lib/mailman/archives/public
+	<Directory /var/lib/mailman/archives/public>
+		AllowOverride Options
+		Options FollowSymLinks
+	</Directory>
 
-  Alias /images/mailman /usr/share/images/mailman
-  <Location /images/mailman>
-    order allow,deny
-    allow from all
-  </Location>
-
-  RedirectMatch permanent ^/$ http://{lists_host}/mailman/listinfo
-  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>
-
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
-</VirtualHost>
+	Alias /images/mailman /usr/share/images/mailman
+	<Location /images/mailman>
+		order allow,deny
+		allow from all
+	</Location>
+# 20list end

Added: trunk/gforge/etc/httpd.d/20zlist.vhost
===================================================================
--- trunk/gforge/etc/httpd.d/20zlist.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/20zlist.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,14 @@
+# 20zlist.vhost begin
+	RedirectMatch permanent ^/$ http://{lists_host}/mailman/listinfo
+	LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge-lists.log" fusionforge
+	# Ensure that we don't try to use SSL on SSL Servers
+	<IfModule apache_ssl.c>
+    		SSLDisable
+	</IfModule>
+
+	RewriteEngine on
+	RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+	RewriteRule .* - [F]
+</VirtualHost>
+# 20zlist.vhost end

Deleted: trunk/gforge/etc/httpd.d/21list.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/21list.ssl	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/21list.ssl	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,49 +0,0 @@
-#
-# List host
-#
-# HTTPS
-<VirtualHost *:443>
-  ServerName {lists_host}
-  AddHandler cgi-script .cgi
-
-  <IfModule mod_ssl.c>
-    SSLEngine on
-    SSLCertificateFile {sys_sslcrt}
-    SSLCertificateKeyFile {sys_sslkey}
-    <Files ~ "\.(cgi|shtml)$">
-      SSLOptions +StdEnvVars
-    </Files>
-    <Directory "/usr/lib/cgi-bin">
-      SSLOptions +StdEnvVars
-    </Directory>
-    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-  </IfModule>
-
-  <IfModule apache_ssl.c>
-    SSLEnable
-  </IfModule>
-
-  ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
-  ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
-
-  Alias /pipermail /var/lib/mailman/archives/public
-  <Directory /var/lib/mailman/archives/public>
-    AllowOverride Options
-    Options FollowSymLinks
-  </Directory>
-
-  Alias /images/mailman /usr/share/images/mailman
-  <Location /images/mailman>
-    order allow,deny
-    allow from all
-  </Location>
-
-  RedirectMatch permanent ^/$ https://{lists_host}/mailman/listinfo
-  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-  CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
-
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
-</VirtualHost>
-

Copied: trunk/gforge/etc/httpd.d/21list.vhost.ssl (from rev 8857, trunk/gforge/etc/httpd.d/21list.ssl)
===================================================================
--- trunk/gforge/etc/httpd.d/21list.vhost.ssl	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/21list.vhost.ssl	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,47 @@
+# 21list.vhost.ssl begin
+<VirtualHost *:443>
+	ServerName {lists_host}
+
+	<IfModule mod_ssl.c>
+		SSLEngine on
+		SSLCertificateFile {sys_sslcrt}
+		SSLCertificateKeyFile {sys_sslkey}
+		<Files ~ "\.(cgi|shtml)$">
+			SSLOptions +StdEnvVars
+		</Files>
+		<Directory "/usr/lib/cgi-bin">
+			SSLOptions +StdEnvVars
+		</Directory>
+		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	</IfModule>
+
+	<IfModule apache_ssl.c>
+		SSLEnable
+	</IfModule>
+	##### COPY 20list begin #####
+	AddHandler cgi-script .cgi
+
+	ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+	ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+
+	Alias /pipermail /var/lib/mailman/archives/public
+	<Directory /var/lib/mailman/archives/public>
+		AllowOverride Options
+		Options FollowSymLinks
+	</Directory>
+
+	Alias /images/mailman /usr/share/images/mailman
+	<Location /images/mailman>
+		order allow,deny
+		allow from all
+	</Location>
+	##### COPY 20list end #####
+	RedirectMatch permanent ^/$ https://{lists_host}/mailman/listinfo
+	LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge-list-ssl.log" fusionforge
+
+	RewriteEngine on
+	RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+	RewriteRule .* - [F]
+</VirtualHost>
+# 21list.vhost.ssl end

Copied: trunk/gforge/etc/httpd.d/40project.vhost (from rev 8857, trunk/gforge/etc/httpd.d/40virtualhost)
===================================================================
--- trunk/gforge/etc/httpd.d/40project.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/40project.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,24 @@
+# 40project.vhost begin
+<VirtualHost *:80>
+	ServerName {domain_name}
+	ServerAlias *.{domain_name}
+	VirtualDocumentRoot {gforge_chroot}{groupdir}/%1/htdocs
+        VirtualScriptAlias {gforge_chroot}{groupdir}/%1/cgi-bin
+	DirectoryIndex index.html index.php
+	php_admin_value default_charset "UTF-8"
+	php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:."
+	Alias /themes-gforge/ /usr/share/gforge/www/themes/
+        <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\"" fusionforge
+	CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge-project-vhost.log" fusionforge
+	# Ensure that we don't try to use SSL on SSL Servers
+	<IfModule apache_ssl.c>
+		SSLDisable
+	</IfModule>
+</VirtualHost>
+# 40project.vhost end

Deleted: trunk/gforge/etc/httpd.d/40virtualhost
===================================================================
--- trunk/gforge/etc/httpd.d/40virtualhost	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/40virtualhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,26 +0,0 @@
-#
-# * hosts
-#
-<VirtualHost *:80>
-	ServerName {domain_name}
-	ServerAlias *.{domain_name}
-	VirtualDocumentRoot {gforge_chroot}{groupdir}/%1/htdocs
-        VirtualScriptAlias {gforge_chroot}{groupdir}/%1/cgi-bin
-	DirectoryIndex index.html index.php
-	php_admin_value default_charset "UTF-8"
-	php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:."
-	Alias /themes-gforge/ /usr/share/gforge/www/themes/
-        <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>
-

Copied: trunk/gforge/etc/httpd.d/55dnsalias.vhost (from rev 8857, trunk/gforge/etc/httpd.d/55vhost)
===================================================================
--- trunk/gforge/etc/httpd.d/55dnsalias.vhost	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/55dnsalias.vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,9 @@
+# 55dnsalias.vhost begin
+#This may be used 
+#ServerPath /sub1/
+#RewriteEngine On
+#RewriteRule ^(/sub1/.*) /www/subdomain$1
+
+# Other virtual hosts, as requested by users
+Include /var/lib/gforge/etc/httpd.vhosts
+# 55dnsalias.vhost end

Deleted: trunk/gforge/etc/httpd.d/55vhost
===================================================================
--- trunk/gforge/etc/httpd.d/55vhost	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/55vhost	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,7 +0,0 @@
-#This may be used 
-#ServerPath /sub1/
-#RewriteEngine On
-#RewriteRule ^(/sub1/.*) /www/subdomain$1
-
-# Other virtual hosts, as requested by users
-Include /var/lib/gforge/etc/httpd.vhosts

Modified: trunk/gforge/etc/httpd.d/61plugin-scmdarcs
===================================================================
--- trunk/gforge/etc/httpd.d/61plugin-scmdarcs	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/61plugin-scmdarcs	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,3 +1,5 @@
+# 61plugin-scmdarcs begin
 <Directory {usr_share_gforge}/plugins/scmdarcs/cgi-bin>
-  SetEnv DARCSWEB_CONFPATH /etc/gforge/plugins/scmdarcs/
+	SetEnv DARCSWEB_CONFPATH /etc/gforge/plugins/scmdarcs/
 </Directory>
+# 61plugin-scmdarcs end

Modified: trunk/gforge/etc/httpd.d/61plugin-scmgit
===================================================================
--- trunk/gforge/etc/httpd.d/61plugin-scmgit	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/etc/httpd.d/61plugin-scmgit	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,3 +1,5 @@
+# 61plugin-scmgit begin
 <Directory {usr_share_gforge}/plugins/scmgit/cgi-bin>
-  SetEnv GITWEB_CONFIG /etc/gforge/plugins/scmgit/gitweb.conf
+	SetEnv GITWEB_CONFIG /etc/gforge/plugins/scmgit/gitweb.conf
 </Directory>
+# 61plugin-scmgit end

Added: trunk/gforge/etc/httpd.d/99maindirhttp
===================================================================
--- trunk/gforge/etc/httpd.d/99maindirhttp	                        (rev 0)
+++ trunk/gforge/etc/httpd.d/99maindirhttp	2010-02-24 00:55:26 UTC (rev 8858)
@@ -0,0 +1,4 @@
+# 99maindirhttp begin
+Alias {sys_urlprefix} {usr_share_gforge}/www/
+DocumentRoot {usr_share_gforge}/www
+# 99maindirhttp end

Modified: trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-02-24 00:55:26 UTC (rev 8858)
@@ -1,3 +1,4 @@
+# 03mediawiki begin
 <Directory /var/lib/gforge/plugins/mediawiki>
         Options +FollowSymLinks -Indexes
         AllowOverride All
@@ -13,3 +14,4 @@
         Options -FollowSymLinks
         AllowOverride None
 </DirectoryMatch>
+# 03mediawiki end

Modified: trunk/gforge/setup
===================================================================
--- trunk/gforge/setup	2010-02-23 17:01:47 UTC (rev 8857)
+++ trunk/gforge/setup	2010-02-24 00:55:26 UTC (rev 8858)
@@ -2,7 +2,7 @@
 # This script is used by the debian and RPM packages to set up fusionforge.
 
 usage() {
-	echo "$0: [-interact] [-help] [-debug] [-confdir confdir] [-input conffile] [-output conffile] [-httpdconf gforgehttpdconf] [-httpdsecrets gforgehttpdsecrets] [-localinc gforgelocalinc] [-example|-fhs] [-clean] [-noapache] [-dovhost] [-home homepath] [-group grouppath] [-listen80|nolisten80] [-nossl]"
+	echo "$0: [-interact] [-help] [-debug] [-confdir confdir] [-input conffile] [-output conffile] [-httpdconf gforgehttpdconf] [-httpdsecrets gforgehttpdsecrets] [-localinc gforgelocalinc] [-example|-fhs] [-clean] [-noapache] [-dovhost] [-novhost] [-home homepath] [-group grouppath] [-listen80|nolisten80] [-nossl]"
 }
 
 getval(){
@@ -132,6 +132,7 @@
 	DEFAULTsys_forum_return_domain=$DEFAULTdomain_name
 	DEFAULTsys_block_anonymous_downloads=false
 	DEFAULTsys_urlprefix=/
+	DEFAULTdovhost=$dovhost
 	#
 	# TODO
 	#usr_lib_gforge=$GFGDIR
@@ -274,10 +275,10 @@
 	mv $CONFFILEIN.new $CONFFILEIN
 	
 	# Fill in the blanks
-	EXCLUDEVHOST=' -not -name 55vhost'
+	EXCLUDEVHOST='' 		
 	if [ "$dovhost" = true ]
 	then
-		EXCLUDEVHOST='' 		
+		EXCLUDEVHOST=".vhost\|"
 	fi
 	#
 	rm -f $ETCDIR/httpd.d/10cvs
@@ -290,7 +291,7 @@
 	#rm -f $ETCDIR/httpd.d/20list
 	#
 
-	find $ETCTEMPLATEDIR/httpd.d  -follow -type f -regex "$ETCTEMPLATEDIR/httpd.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.ssl\|.secrets\)" $EXCLUDEVHOST | sort | while read i
+	find $ETCTEMPLATEDIR/httpd.d  -follow -type f -regex "$ETCTEMPLATEDIR/httpd.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.ssl\|.secrets\|$EXCLUDEVHOST.vhost.ssl\)" | sort | while read i
 	do
 		if [ "$ETCTEMPLATEDIR" != "$ETCDIR" -a -f $ETCDIR/httpd.d/`basename $i` ]
 		then
@@ -418,10 +419,11 @@
 interact=false
 noapache=false
 database=env
-dovhost=false
 listen80=true
 usessl=true
+dovhost=true
 
+
 while [ $# -ne 0 ]
 do
 	case "$1" in
@@ -491,6 +493,9 @@
 		-noapache )
 			noapache=true
 			;;
+		-novhost )
+			dovhost=false
+			;;
 		-dovhost )
 			dovhost=true
 			;;




More information about the Fusionforge-commits mailing list