[Fusionforge-commits] r9567 - trunk/gforge/etc
Christian Bayle
cbayle at libremir.placard.fr.eu.org
Wed Apr 21 20:46:00 CEST 2010
Author: cbayle
Date: 2010-04-21 20:46:00 +0200 (Wed, 21 Apr 2010)
New Revision: 9567
Modified:
trunk/gforge/etc/httpd.conf.example
trunk/gforge/etc/httpd.secrets.example
Log:
Regenerate httpd examples
Modified: trunk/gforge/etc/httpd.conf.example
===================================================================
--- trunk/gforge/etc/httpd.conf.example 2010-04-21 18:45:54 UTC (rev 9566)
+++ trunk/gforge/etc/httpd.conf.example 2010-04-21 18:46:00 UTC (rev 9567)
@@ -1,14 +1,10 @@
-<IfModule mod_ssl.c>
- Listen 443
-</IfModule>
-NameVirtualHost 10.GF.OR.GE:443
-Listen 80
+# 01common begin
<Files .htaccess>
order allow,deny
deny from all
</Files>
-NameVirtualHost 10.GF.OR.GE:80
+#NameVirtualHost *:80
# This is magic for virtual hosting!
UseCanonicalName Off
@@ -16,17 +12,16 @@
## block web access to CVS directories.
deny from all
</Directory>
-#
-# Main host
-#
-<Directory /path/to/gforge/www>
+# 01common end
+# 05maindirauth begin
+<Directory /opt/gforge/www>
Options Indexes FollowSymlinks
AllowOverride All
order allow,deny
allow from all
- php_admin_value include_path "/path/to/gforge/etc/custom:/etc/gforge:/path/to/gforge:/path/to/gforge/www/include:."
+ php_admin_value include_path "/path/to/gforge/etc/custom:/etc/gforge:/opt/gforge:/opt/gforge/www/include:/opt/gforge/plugins:/usr/share/php:."
php_admin_value default_charset "UTF-8"
- php_flag register_globals "Off"
+ # php_flag register_globals "Off"
###
### safe PHP settings
##
@@ -43,22 +38,26 @@
# 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>
-# HTTP
-<VirtualHost 10.GF.OR.GE:80>
+# 05maindirauth end
+# 060maindirhttp.vhost begin
+<VirtualHost *:80>
ServerName gforge.company.com
ServerAlias www.gforge.company.com
ServerAdmin webmaster at gforge.company.com
- DocumentRoot /path/to/gforge/www
+ DocumentRoot /opt/gforge/www
+ #
# Apache 1.3
- #User www-gforge
- #Group www-gforge
+ # User www-gforge
+ # Group www-gforge
+ #
# Apache 2 apache2-mpm-perchild
- #AssignUserID www-gforge www-gforge
- # Apache 2 but this is not the same
- #<IfModule mod_suexec.c>
+ # AssignUserID www-gforge www-gforge
+ # Apache 2
+ # <IfModule mod_suexec.c>
# SuexecUserGroup www-gforge www-gforge
- #</IfModule>
- Alias /images/ /path/to/gforge/www/images/
+ # </IfModule>
+# 060maindirhttp.vhost end
+# 06maindirhttp begin
DirectoryIndex index.html index.php
<IfModule mod_userdir.c>
UserDir disabled
@@ -66,11 +65,11 @@
php_admin_value default_charset "UTF-8"
- <Directory /path/to/gforge/www>
- Include /etc/httpd.secrets
+ <Directory /opt/gforge/www>
+ Include /etc/gforge/httpd.secrets
</Directory>
- ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
+ ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /opt/gforge/plugins/$1/cgi-bin/$2
# Projects and Users script
<Location /projects>
@@ -79,258 +78,146 @@
<Location /users>
ForceType application/x-httpd-php
</Location>
- <Location /wiki/g>
- ForceType application/x-httpd-php
- </Location>
# 404 Error document
ErrorDocument 404 /404.php
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/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/([^/]*)/(.*) /home/groups/$1/htdocs/$2
-# ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) /home/groups/$1/cgi-bin/$2
-# <Directory /home/groups>
-# Options Indexes FollowSymlinks
-# AllowOverride All
-# order allow,deny
-# allow from all
-# </Directory>
+ # AliasMatch ^/www/([^/]*)/(.*) /home/groups/$1/htdocs/$2
+ # ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) /home/groups/$1/cgi-bin/$2
+ # <Directory /home/groups>
+ # 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>
-</VirtualHost>
+ Alias /fckeditor/ /usr/share/fckeditor/
+ <Directory "/usr/share/fckeditor/">
+ Options Indexes MultiViews FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
-# HTTPS
-<VirtualHost 10.GF.OR.GE:443>
- ServerName gforge.company.com
- ServerAlias www.gforge.company.com
- ServerAdmin webmaster at gforge.company.com
- # Apache 1.3
- #User www-gforge
- #Group www-gforge
- # Apache 2 apache2-mpm-perchild
- #AssignUserID www-gforge www-gforge
- # Apache 2
- <IfModule mod_suexec.c>
- SuexecUserGroup www-gforge www-gforge
- </IfModule>
- DocumentRoot /path/to/gforge/www
- Alias /images/ /path/to/gforge/www/images/
- DirectoryIndex index.html index.php
- <IfModule mod_userdir.c>
- UserDir disabled
- </IfModule>
+ RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
+ AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /opt/gforge/www/plugins/mediawiki/index.php
+ AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/projects/$1/images/$2
- php_admin_value default_charset "UTF-8"
+ Alias /anonscm/ /var/lib/gforge/chroot/scmrepos/
- <Directory /path/to/gforge/www>
- Include /etc/httpd.secrets
- </Directory>
+ <DirectoryMatch /var/lib/gforge/chroot/scmrepos/[^/]*>
+ Options -Indexes
+ </DirectoryMatch>
+ <DirectoryMatch /var/lib/gforge/chroot/scmrepos/[^/]*/.*>
+ Options +Indexes
+ </DirectoryMatch>
- ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
+ <Proxy http://127.0.0.1:8081/*>
+ Allow from all
+ </Proxy>
- # Projects and Users script
- <Location /projects>
- ForceType application/x-httpd-php
+ <Location /scm/loggerhead/>
+ ProxyPass http://127.0.0.1:8081/
+ ProxyPassReverse http://127.0.0.1:8081/
</Location>
- <Location /users>
- ForceType application/x-httpd-php
- </Location>
- <Location /wiki/g>
- ForceType application/x-httpd-php
- </Location>
+# 06maindirhttp end
+# 06zmaindirhttp.vhost begin
+ Alias / /opt/gforge/www/
+ LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+ CustomLog "|/usr/bin/cronolog /path/to/var/log/gforge/%Y/%m/%d/fusionforge.log" fusionforge
- # 404 Error document
- ErrorDocument 404 /404.php
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/var/log/gforge/%Y/%m/%d/gforge.log" gforge
-
- <IfModule mod_ssl.c>
- SSLEngine on
- SSLCertificateFile /etc/apache2/ssl/apache.pem
- SSLCertificateKeyFile /etc/apache2/ssl/apache.pem
- <Files ~ "\.(cgi|shtml)$">
- SSLOptions +StdEnvVars
- </Files>
- <Directory "/usr/lib/cgi-bin">
- SSLOptions +StdEnvVars
- </Directory>
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- </IfModule>
-
+ # Ensure that we don't try to use SSL on SSL Servers
<IfModule apache_ssl.c>
- SSLEnable
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+ SSLDisable
</IfModule>
-</VirtualHost>
-#
-# SCM host
-#
-<Directory /path/to/gforge/scm>
- Options Indexes FollowSymlinks
- AllowOverride All
- order allow,deny
- allow from all
- php_admin_value include_path "/path/to/gforge/etc/custom:/etc/gforge:/path/to/gforge:/path/to/gforge/www/include:."
- php_admin_value default_charset "UTF-8"
-</Directory>
-
-# SCM HTTP vhost
-<VirtualHost 10.GF.OR.GE:80>
- ServerName cvs.gforge.company.com
- DocumentRoot /path/to/gforge/scm
- Alias /images/ /path/to/gforge/www/images/
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/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>
+# 06zmaindirhttp.vhost end
+# 200list.vhost begin
+<VirtualHost *:80>
+ ServerName lists.gforge.company.com
+# 200list.vhost end
+# 20list begin
+ AddHandler cgi-script .cgi
-# SCM HTTP SSL vhost
-<VirtualHost 10.GF.OR.GE:443>
- ServerName cvs.gforge.company.com
- DocumentRoot /path/to/gforge/scm
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/var/log/gforge/%Y/%m/%d/gforge.log" gforge
+ ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+ ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
- <IfModule mod_ssl.c>
- SSLEngine on
- SSLCertificateFile /etc/apache2/ssl/apache.pem
- SSLCertificateKeyFile /etc/apache2/ssl/apache.pem
- <Files ~ "\.(cgi|shtml)$">
- SSLOptions +StdEnvVars
- </Files>
- <Directory "/usr/lib/cgi-bin">
- SSLOptions +StdEnvVars
- </Directory>
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- </IfModule>
+ Alias /pipermail /var/lib/mailman/archives/public
+ <Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+ </Directory>
- <IfModule apache_ssl.c>
- SSLEnable
- </IfModule>
+ Alias /images/mailman /usr/share/images/mailman
+ <Location /images/mailman>
+ order allow,deny
+ allow from all
+ </Location>
+# 20list end
+# 20zlist.vhost begin
+ RedirectMatch permanent ^/$ http://lists.gforge.company.com/mailman/listinfo
+ LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+ CustomLog "|/usr/bin/cronolog /path/to/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>
-
-#
-# Download host
-#
-<VirtualHost 10.GF.OR.GE:80>
- ServerName download.gforge.company.com
- DocumentRoot /path/to/var/lib/gforge/download
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/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>
-
-#
-# List host
-#
-# HTTP
-<VirtualHost 10.GF.OR.GE:80>
- ServerName lists.gforge.company.com
- AddHandler cgi-script .cgi
-
- 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 ^/$ http://lists.gforge.company.com/mailman/listinfo
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/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>
-#
-# List host
-#
-# HTTPS
-<VirtualHost 10.GF.OR.GE:443>
- ServerName lists.gforge.company.com
- AddHandler cgi-script .cgi
-
- <IfModule mod_ssl.c>
- SSLEngine on
- SSLCertificateFile /etc/apache2/ssl/apache.pem
- SSLCertificateKeyFile /etc/apache2/ssl/apache.pem
- <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 /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.gforge.company.com/mailman/listinfo
- LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
- CustomLog "|/usr/bin/cronolog /path/to/var/log/gforge/%Y/%m/%d/gforge.log" gforge
-</VirtualHost>
-
-#
-# * hosts
-#
-<VirtualHost 10.GF.OR.GE:80>
+# 20zlist.vhost end
+# 40project.vhost begin
+<VirtualHost *:80>
ServerName gforge.company.com
ServerAlias *.gforge.company.com
VirtualDocumentRoot /home/groups/%1/htdocs
VirtualScriptAlias /home/groups/%1/cgi-bin
DirectoryIndex index.html index.php
php_admin_value default_charset "UTF-8"
- php_admin_value include_path "/path/to/gforge/etc/custom:/etc/gforge:/path/to/gforge:/path/to/gforge/www/include:."
+ php_admin_value include_path "/path/to/gforge/etc/custom:/etc/gforge:/opt/gforge:/opt/gforge/www/include:."
Alias /themes-gforge/ /usr/share/gforge/www/themes/
<Directory /home/groups>
- 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 "|/usr/bin/cronolog /path/to/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>
+ 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 "|/usr/bin/cronolog /path/to/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
+# 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
+# 61plugin-scmdarcs begin
+<Directory /opt/gforge/plugins/scmdarcs/cgi-bin>
+ SetEnv DARCSWEB_CONFPATH /etc/gforge/plugins/scmdarcs/
+</Directory>
+# 61plugin-scmdarcs end
+# 61plugin-scmgit begin
+<Directory /opt/gforge/plugins/scmgit/cgi-bin>
+ SetEnv GITWEB_CONFIG /etc/gforge/plugins/scmgit/gitweb.conf
+</Directory>
+# 61plugin-scmgit end
+# 99maindirhttp begin
+#Alias / /opt/gforge/www/
+DocumentRoot /opt/gforge/www
+# 99maindirhttp end
Modified: trunk/gforge/etc/httpd.secrets.example
===================================================================
--- trunk/gforge/etc/httpd.secrets.example 2010-04-21 18:45:54 UTC (rev 9566)
+++ trunk/gforge/etc/httpd.secrets.example 2010-04-21 18:46:00 UTC (rev 9567)
@@ -1,10 +1,24 @@
# PLEASE DO NOT REMOVE THIS LINE
SetEnv sys_localinc /path/to/local.inc
-SetEnv sys_gfdbhost
-SetEnv sys_gfdbport 5432
-SetEnv sys_gfdbname alexandria
-SetEnv sys_gfdbuser www
-SetEnv sys_gfdbpasswd
-SetEnv sys_gfldap_passwd
-SetEnv sys_jabber_pass
+
+#RequestHeader unset GForgeDbhost
+#RequestHeader append GForgeDbhost
+
+#RequestHeader unset GForgeDbport
+#RequestHeader append GForgeDbport 5432
+
+RequestHeader unset GForgeDbname
+RequestHeader append GForgeDbname alexandria
+
+RequestHeader unset GForgeDbuser
+RequestHeader append GForgeDbuser www
+
+RequestHeader unset GForgeDbpasswd
+RequestHeader append GForgeDbpasswd
+
+RequestHeader unset GForgeLdapPasswd
+RequestHeader append GForgeLdapPasswd
+
+RequestHeader unset GForgeJabberPasswd
+RequestHeader append GForgeJabberPasswd
More information about the Fusionforge-commits
mailing list