[evolvis-commits] r6667: shuffle httpd configs around, split and re-join in different places↵

Thorsten Glaser t.glaser at tarent.de
Tue Jun 1 17:44:54 CEST 2010


Author: Thorsten Glaser <t.glaser at tarent.de>
Date: 2010-06-01 17:44:54 +0200 (Tue, 01 Jun 2010)
New Revision: 6667

Added:
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/02namevhost
   trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.security.inc
   trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.list.inc
   trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc
   trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.projects.inc
Removed:
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common.ssl
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/07maindirhttp.ssl
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/21list.ssl
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/41virtualhost.ssl
Modified:
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/05maindirauth
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/06maindirhttp
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/20list
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/40virtualhost
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/55vhost
   trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/README
   trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhosts
Log:
shuffle httpd configs around, split and re-join in different places


Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common	2010-06-01 15:44:54 UTC (rev 6667)
@@ -3,7 +3,6 @@
   deny from all
 </Files>
 
-NameVirtualHost *:80
 # This is magic for virtual hosting!
 UseCanonicalName Off
 
@@ -11,3 +10,4 @@
   ## block web access to CVS directories.
   deny from all
 </Directory>
+

Deleted: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common.ssl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common.ssl	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common.ssl	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1 +0,0 @@
-NameVirtualHost *:443

Copied: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/02namevhost (from rev 6666, trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/01common.ssl)
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/02namevhost	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/02namevhost	2010-06-01 15:44:54 UTC (rev 6667)
@@ -0,0 +1,3 @@
+NameVirtualHost *:80
+NameVirtualHost *:443
+

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/05maindirauth
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/05maindirauth	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/05maindirauth	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,12 +1,12 @@
 #
-# Main host
+# Main directory authentication
 #
 <Directory {usr_share_gforge}/www>
   Options Indexes FollowSymlinks
   AllowOverride All
   order allow,deny
   allow from all
-  php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:."
+  php_admin_value include_path "{sys_custom_path}:{gforge_etc}:{usr_share_gforge}:{usr_share_gforge}/www/include:."
   php_admin_value default_charset "UTF-8"
   # php_flag register_globals "Off"
   ###
@@ -25,3 +25,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>
+

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/06maindirhttp
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/06maindirhttp	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/06maindirhttp	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,74 +1,16 @@
-# HTTP
+#
+# Main host
+#
 <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>
-
-	Alias /images/ {usr_share_gforge}/www/images/
-	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 ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
-
-	# Projects and Users script
-	<Location /projects>
-		ForceType application/x-httpd-php
-	</Location>
-	<Location /users>
-		ForceType application/x-httpd-php
-	</Location>
-
-	# 404 Error document
-	ErrorDocument 404 /404.php
-
-	# GForge 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 /fckeditor/ /usr/share/fckeditor/
-        <Directory "/usr/share/fckeditor/">
-            Options Indexes MultiViews FollowSymLinks
-            AllowOverride None
-            Order allow,deny
-	    allow from all
-        </Directory>
-
-	RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
-	AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
-	AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
-	AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
-
-        RewriteEngine on
-        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-        RewriteRule .* - [F]
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl0.inc
+	Include {gforge_etc}/httpd.vhost.maindir.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl0.inc
 </VirtualHost>
+<VirtualHost *:443>
+	Include {gforge_etc}/httpd.vhost.maindir.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl1.inc
+</VirtualHost>
 

Deleted: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/07maindirhttp.ssl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/07maindirhttp.ssl	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/07maindirhttp.ssl	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,74 +0,0 @@
-# HTTPS
-<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 but this is not the same
-	#<IfModule mod_suexec.c>
-	#	SuexecUserGroup {sys_apache_user} {sys_apache_group}
-	#</IfModule>
-
-	Alias /images/ {usr_share_gforge}/www/images/
-	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 ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
-
-	# Projects and Users script
-	<Location /projects>
-		ForceType application/x-httpd-php
-	</Location>
-	<Location /users>
-		ForceType application/x-httpd-php
-	</Location>
-
-	# 404 Error document
-	ErrorDocument 404 /404.php
-
-	# GForge 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 /fckeditor/ /usr/share/fckeditor/
-        <Directory "/usr/share/fckeditor/">
-            Options Indexes MultiViews FollowSymLinks
-            AllowOverride None
-            Order allow,deny
-	    allow from all
-        </Directory>
-
-	RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
-	AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
-	AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
-	AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
-
-        RewriteEngine on
-        RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-        RewriteRule .* - [F]
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl1.inc
-</VirtualHost>
-

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/20list
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/20list	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/20list	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,32 +1,22 @@
 #
 # List host
 #
-# HTTP
 <VirtualHost *:80>
-  ServerName {lists_host}
-  AddHandler cgi-script .cgi
+	Include {gforge_etc}/httpd.vhost.list.inc
 
-  ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
-  ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+	RedirectMatch permanent ^/$ http://{lists_host}/cgi-bin/mailman/listinfo
 
-  Alias /pipermail /var/lib/mailman/archives/public
-  <Directory /var/lib/mailman/archives/public>
-    AllowOverride Options
-    Options FollowSymLinks
-  </Directory>
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl0.inc
+</VirtualHost>
+<VirtualHost *:443>
+	Include {gforge_etc}/httpd.vhost.list.inc
 
-  Alias /images/mailman /usr/share/images/mailman
-  <Location /images/mailman>
-    order allow,deny
-    allow from all
-  </Location>
+	RedirectMatch permanent ^/$ https://{lists_host}/cgi-bin/mailman/listinfo
 
-  RedirectMatch permanent ^/$ http://{lists_host}/cgi-bin/mailman/listinfo
-
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl0.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl0.inc
 </VirtualHost>
+

Deleted: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/21list.ssl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/21list.ssl	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/21list.ssl	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,33 +0,0 @@
-#
-# List host
-#
-# HTTPS
-<VirtualHost *:443>
-  ServerName {lists_host}
-  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>
-
-  RedirectMatch permanent ^/$ https://{lists_host}/cgi-bin/mailman/listinfo
-
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl1.inc
-</VirtualHost>
-

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/40virtualhost
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/40virtualhost	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/40virtualhost	2010-06-01 15:44:54 UTC (rev 6667)
@@ -2,22 +2,15 @@
 # * hosts
 #
 <VirtualHost *:80>
-	ServerName {domain_name}
-	ServerAlias *.{domain_name}
-	VirtualDocumentRoot {gforge_chroot}{groupdir}/%1/htdocs
-        VirtualScriptAlias {gforge_chroot}{groupdir}/%1/cgi-bin
-	SetEnvIf Host "(.*)\.evolvis\.org" AWSTATS_FORCE_CONFIG=group-$1
-	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>
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl0.inc
+	Include {gforge_etc}/httpd.vhost.projects.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl0.inc
 </VirtualHost>
+<VirtualHost *:443>
+	Include {gforge_etc}/httpd.vhost.projects.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl1.inc
+</VirtualHost>
+

Deleted: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/41virtualhost.ssl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/41virtualhost.ssl	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/41virtualhost.ssl	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,20 +0,0 @@
-<VirtualHost *:443>
-	ServerName {domain_name}
-	ServerAlias *.{domain_name}
-	VirtualDocumentRoot {gforge_chroot}{groupdir}/%1/htdocs
-        VirtualScriptAlias {gforge_chroot}{groupdir}/%1/cgi-bin
-	SetEnvIf Host "(.*)\.evolvis\.org" AWSTATS_FORCE_CONFIG=group-$1
-	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>
-
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl1.inc
-</VirtualHost>

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/55vhost
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/55vhost	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/55vhost	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,4 +1,4 @@
-#This may be used 
+#This may be used
 #ServerPath /sub1/
 #RewriteEngine On
 #RewriteRule ^(/sub1/.*) /www/subdomain$1

Modified: trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/README
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/README	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/httpd.d/README	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,4 +1,4 @@
 This dir contains templates files
-Edit carefully and use the gforge.conf defined var 
+Edit carefully and use the gforge.conf defined var
 as much as possible
 These files are used to build a proper httpd.conf file

Added: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.security.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.security.inc	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.security.inc	2010-06-01 15:44:54 UTC (rev 6667)
@@ -0,0 +1,5 @@
+# some security thing
+
+RewriteEngine on
+RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+RewriteRule .* - [F]

Added: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.list.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.list.inc	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.list.inc	2010-06-01 15:44:54 UTC (rev 6667)
@@ -0,0 +1,20 @@
+# lists vhost content
+
+ServerName {lists_host}
+
+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>

Added: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc	2010-06-01 15:44:54 UTC (rev 6667)
@@ -0,0 +1,62 @@
+# maindirhttpd vhost content
+
+ServerName {domain_name}
+ServerAlias www.{domain_name}
+ServerAdmin {server_admin}
+DocumentRoot {usr_share_gforge}/www
+DirectoryIndex index.html index.php
+
+# 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>
+
+<IfModule mod_userdir.c>
+	UserDir disabled
+</IfModule>
+
+<Directory {usr_share_gforge}/www>
+	Include {gforge_etc}/httpd.secrets
+</Directory>
+
+<Location /projects>
+	ForceType application/x-httpd-php
+</Location>
+<Location /users>
+	ForceType application/x-httpd-php
+</Location>
+
+ErrorDocument 404 /404.php
+
+php_admin_value default_charset "UTF-8"
+
+Alias /images/ {usr_share_gforge}/www/images/
+ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) {usr_share_gforge}/plugins/$1/cgi-bin/$2
+RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
+AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php {usr_share_gforge}/www/plugins/mediawiki/index.php
+AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/wikidata/$1/images/$2
+AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
+
+Alias /fckeditor/ /usr/share/fckeditor/
+<Directory "/usr/share/fckeditor/">
+	Options Indexes MultiViews FollowSymLinks
+	AllowOverride None
+	Order allow,deny
+	allow from all
+</Directory>
+
+# 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>

Added: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.projects.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.projects.inc	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.projects.inc	2010-06-01 15:44:54 UTC (rev 6667)
@@ -0,0 +1,22 @@
+# per-project vhost content
+
+ServerName siteadmin.{domain_name}
+ServerAlias *.{domain_name}
+DirectoryIndex index.html index.php index.htm
+
+VirtualDocumentRoot {gforge_chroot}{groupdir}/%1/htdocs
+VirtualScriptAlias {gforge_chroot}{groupdir}/%1/cgi-bin
+
+SetEnvIf Host "(.*)\.{domain_name}" AWSTATS_FORCE_CONFIG=group-$1
+
+php_admin_value default_charset "UTF-8"
+php_admin_value include_path "{sys_custom_path}:{gforge_etc}:{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>

Modified: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhosts
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhosts	2010-06-01 15:44:52 UTC (rev 6666)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhosts	2010-06-01 15:44:54 UTC (rev 6667)
@@ -1,21 +1,24 @@
 <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>
+	VirtualScriptAlias {cgidir}
 
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl0.inc
+	<Directory {gforge_chroot}{groupdir}>
+		Options Indexes FollowSymlinks
+		AllowOverride All
+		order allow,deny
+		allow from all
+	</Directory>
+
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl0.inc
 </VirtualHost>
 <VirtualHost {ip_address}:443>
 	ServerName {vhost_name}
 	VirtualDocumentRoot {docdir}
 	VirtualScriptAlias {cgidir}
+
 	<Directory {gforge_chroot}{groupdir}>
 		Options Indexes FollowSymlinks
 		AllowOverride All
@@ -23,6 +26,7 @@
 		allow from all
 	</Directory>
 
-	Include /etc/gforge/httpd.log.inc
-	Include /etc/gforge/httpd.ssl1.inc
+	Include {gforge_etc}/httpd.security.inc
+	Include {gforge_etc}/httpd.log.inc
+	Include {gforge_etc}/httpd.ssl1.inc
 </VirtualHost>




More information about the evolvis-commits mailing list