Dzahn has submitted this change and it was merged.
Change subject: Simplify wikimania apache confs, reuse wikimedia.org docroot.
......................................................................
Simplify wikimania apache confs, reuse wikimedia.org docroot.
Change-Id: Ifa99b34b1fbb81cfde9f0793d707dfdbc6559c67
---
M all.conf
M remnant.conf
A wikimania.conf
3 files changed, 93 insertions(+), 455 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/all.conf b/all.conf
index 1856a3d..e5df6a8 100644
--- a/all.conf
+++ b/all.conf
@@ -24,6 +24,9 @@
# A couple of redirects for old secure.wikimedia.org
Include /etc/apache2/wmf/secure.wikimedia.conf
+# wikimania*.wikimedia.org
+Include /etc/apache2/wmf/wikimania.conf
+
# *.wikimedia.org
Include /etc/apache2/wmf/wikimedia.conf
diff --git a/remnant.conf b/remnant.conf
index 37a117a..5c5dc89 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -196,424 +196,6 @@
</Directory>
</VirtualHost>
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2005"
- ServerName wikimania2005.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2005/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2005/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2005/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2005/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-# <Directory "/usr/local/apache/common/docroot/wikimania/registration">
-# <IfModule mod_php5.c>
-# php_admin_flag engine on
-# </IfModule>
-# DirectoryIndex index.html index.php
-# </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2006"
- ServerName wikimania2006.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2006/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2006/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2006/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2006/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2007"
- ServerName wikimania2007.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2007/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2007/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2007/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2007/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2008"
- ServerName wikimania2008.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2008/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2008/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2008/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2008/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2009"
- ServerName wikimania2009.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2009/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2009/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2009/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2009/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2010"
- ServerName wikimania2010.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2010/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2010/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2010/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2010/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2011"
- ServerName wikimania2011.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2011/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2011/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2011/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2011/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki - 2012
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2012"
- ServerName wikimania2012.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2012/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2012/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2012/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2012/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki - 2013
-
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2013"
- ServerName wikimania2013.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2013/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2013/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2013/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2013/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimania wiki - 2014
-
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimania2014"
- ServerName wikimania2014.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimania2014/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- # Early phase 2 compatibility URLs
- RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Uploads are offsite
- RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2014/$1 [R=302]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimania2014/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimania2014/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
# Internal wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/internal"
@@ -793,43 +375,6 @@
</IfModule>
</Directory>
<Directory "/usr/local/apache/common/docroot/chapcom/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
-# Wikimaniateam wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/wikimaniateam"
- ServerName wikimaniateam.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
- RewriteCond %{HTTP:X-Forwarded-Proto} !https
- RewriteRule ^/(.*)$ https://wikimaniateam.wikimedia.org/$1 [R=301,L]
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/wikimaniateam/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- # Configurable favicon
- RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
- <Directory "/usr/local/apache/common/docroot/wikimaniateam/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/wikimaniateam/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
diff --git a/wikimania.conf b/wikimania.conf
new file mode 100644
index 0000000..e7352ac
--- /dev/null
+++ b/wikimania.conf
@@ -0,0 +1,90 @@
+# Wikimania wikis
+<VirtualHost *>
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
+
+ ServerName wikimania
+ ServerAlias wikimania2005.wikimedia.org wikimania2006.wikimedia.org
wikimania2007.wikimedia.org wikimania2008.wikimedia.org
wikimania2009.wikimedia.org wikimania2010.wikimedia.org
wikimania2011.wikimedia.org wikimania2012.wikimedia.org
wikimania2013.wikimedia.org wikimania2014.wikimedia.org
+
+ AllowEncodedSlashes On
+
+ UseCanonicalName Off
+
+ RewriteEngine On
+
+ # Primary wiki redirector:
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
+ RewriteRule ^/$ /w/index.php
+
+ # UseMod compatibility URLs
+ RewriteCond %{QUERY_STRING} ([^&;]+)
+ RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
+ RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
+
+ # Early phase 2 compatibility URLs
+ RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
+
+ RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Uploads to the host-specific directory
+ # First grab the subdomain from HTTP_HOST
+ RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikimedia\.org
+ # Now use it
+ RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikipedia/%1/$1
[R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
+ # Load robots.txt from the wiki
+ RewriteRule ^/robots.txt$ /w/robots.php [L]
+
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w">
+ <IfModule mod_php5.c>
+ php_admin_flag engine on
+ </IfModule>
+ </Directory>
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
+ <IfModule mod_php5.c>
+ php_admin_flag engine off
+ </IfModule>
+ </Directory>
+</VirtualHost>
+
+# Wikimaniateam wiki
+<VirtualHost *>
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
+ ServerName wikimaniateam.wikimedia.org
+
+ AllowEncodedSlashes On
+
+ RewriteEngine On
+ RewriteCond %{HTTP:X-Forwarded-Proto} !https
+ RewriteRule ^/(.*)$ https://wikimaniateam.wikimedia.org/$1 [R=301,L]
+
+ # Primary wiki redirector:
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
+ RewriteRule ^/$ /w/index.php
+
+ # UseMod compatibility URLs
+ RewriteCond %{QUERY_STRING} ([^&;]+)
+ RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
+ RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
+
+ RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w">
+ <IfModule mod_php5.c>
+ php_admin_flag engine on
+ </IfModule>
+ </Directory>
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
+ <IfModule mod_php5.c>
+ php_admin_flag engine off
+ </IfModule>
+ </Directory>
+</VirtualHost>
+
+
+# vim: syn=apache sts=4 sw=4 autoindent
--
To view, visit https://gerrit.wikimedia.org/r/84707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa99b34b1fbb81cfde9f0793d707dfdbc6559c67
Gerrit-PatchSet: 13
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
