Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Move a lot of the miscellaneous wikis out of their own specific
docroots
......................................................................
Move a lot of the miscellaneous wikis out of their own specific docroots
Change-Id: I278f470674aebc2186d52778cadf5f56c763da46
---
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/remnant.conf
M modules/mediawiki/files/apache/sites/wikimedia.conf
3 files changed, 133 insertions(+), 134 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index e82f37c..ef3fef3 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -59,38 +59,38 @@
<VirtualHost *:80>
ServerName test.wikidata.org
- DocumentRoot "/srv/mediawiki/docroot/testwikidata"
+ DocumentRoot "/srv/mediawiki/docroot/wikidata"
AllowEncodedSlashes On
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
</IfDefine>
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/testwikidata/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/testwikidata/w">
+ <Directory "/srv/mediawiki/docroot/wikidata/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/testwikidata/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikidata/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -284,7 +284,7 @@
<VirtualHost *:80>
ServerName donate.wikimedia.org
ServerAlias donate.wikipedia.org
- DocumentRoot "/srv/mediawiki/docroot/donate"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
@@ -293,7 +293,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/donate/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
# Push to SSL
RewriteCond %{HTTP:X-Forwarded-Proto} !https
@@ -309,12 +309,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/donate/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/donate/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -324,12 +324,12 @@
<VirtualHost *:80>
ServerName vote.wikimedia.org
- DocumentRoot "/srv/mediawiki/docroot/vote"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/vote/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
@@ -337,12 +337,12 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://vote.wikimedia.org%{REQUEST_URI} [R=301]
- <Directory "/srv/mediawiki/docroot/vote/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/vote/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
diff --git a/modules/mediawiki/files/apache/sites/remnant.conf
b/modules/mediawiki/files/apache/sites/remnant.conf
index cfcb30d..c5b2f35 100644
--- a/modules/mediawiki/files/apache/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/sites/remnant.conf
@@ -1,6 +1,6 @@
# Meta
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/meta"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName meta.wikimedia.org
AllowEncodedSlashes On
@@ -14,7 +14,7 @@
RewriteRule ^/robots.txt$ /w/robots.php [L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/meta/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -34,12 +34,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/meta/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/meta/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -48,7 +48,7 @@
# Wikisource
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/sources"
+ DocumentRoot "/srv/mediawiki/docroot/wikisource.org"
ServerName wikisource.org
AllowEncodedSlashes On
@@ -59,7 +59,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/sources/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikisource.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -75,12 +75,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/sources/w">
+ <Directory "/srv/mediawiki/docroot/wikisource.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/sources/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikisource.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -133,7 +133,7 @@
# Internal grants wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/grants"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName grants.wikimedia.org
AllowEncodedSlashes On
@@ -143,7 +143,7 @@
RewriteRule ^/(.*)$ https://grants.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/grants/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -151,12 +151,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/grants/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/grants/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -165,7 +165,7 @@
# fdc.wikimedia.org - Funds Dissemination Committee Wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/fdc"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName fdc.wikimedia.org
AllowEncodedSlashes On
@@ -175,7 +175,7 @@
RewriteRule ^/(.*)$ https://fdc.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/fdc/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -183,12 +183,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/fdc/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/fdc/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -197,7 +197,7 @@
# Internal wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/internal"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName internal.wikimedia.org
AllowEncodedSlashes On
@@ -207,7 +207,7 @@
RewriteRule ^/(.*)$ https://internal.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/internal/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -215,12 +215,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/internal/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/internal/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -229,7 +229,7 @@
# Board wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/board"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName board.wikimedia.org
AllowEncodedSlashes On
@@ -239,7 +239,7 @@
RewriteRule ^/(.*)$ https://board.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/board/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -247,12 +247,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/board/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/board/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -261,7 +261,7 @@
# Board Governance Committee
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/boardgovcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName boardgovcom.wikimedia.org
AllowEncodedSlashes On
@@ -271,7 +271,7 @@
RewriteRule ^/(.*)$ https://boardgovcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/boardgovcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -279,12 +279,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/boardgovcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/boardgovcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -293,7 +293,7 @@
# Spcom wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/spcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName spcom.wikimedia.org
AllowEncodedSlashes On
@@ -303,7 +303,7 @@
RewriteRule ^/(.*)$ https://spcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/spcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -311,12 +311,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/spcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/spcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -325,7 +325,7 @@
# Chapcom wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/chapcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName chapcom.wikimedia.org
AllowEncodedSlashes On
@@ -335,7 +335,7 @@
RewriteRule ^/(.*)$ https://chapcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/chapcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -343,12 +343,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/chapcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/chapcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -357,7 +357,7 @@
# Incubator wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/incubator"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName incubator.wikimedia.org
AllowEncodedSlashes On
@@ -368,7 +368,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/incubator/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -381,12 +381,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/incubator/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/incubator/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -395,7 +395,7 @@
# WikiSpecies wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/species"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName species.wikimedia.org
AllowEncodedSlashes On
@@ -406,7 +406,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/species/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -422,12 +422,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/species/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/species/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -436,7 +436,7 @@
# search committee private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/searchcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName searchcom.wikimedia.org
AllowEncodedSlashes On
@@ -446,7 +446,7 @@
RewriteRule ^/(.*)$ https://searchcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/searchcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -454,12 +454,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/searchcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/searchcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -506,7 +506,7 @@
# strategy wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/strategy"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName strategy.wikimedia.org
AllowEncodedSlashes On
@@ -517,7 +517,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/strategy/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -530,12 +530,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/strategy/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/strategy/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -544,7 +544,7 @@
# office private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/office"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org
ServerName office.wikimedia.org
AllowEncodedSlashes On
@@ -554,7 +554,7 @@
RewriteRule ^/(.*)$ https://office.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/office/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -562,12 +562,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/office/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/office/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -577,7 +577,7 @@
# chair private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/chair"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName chair.wikimedia.org
AllowEncodedSlashes On
@@ -587,7 +587,7 @@
RewriteRule ^/(.*)$ https://chair.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/chair/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -595,12 +595,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/chair/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/chair/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -609,7 +609,7 @@
# advisory board PUBLIC wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/advisory"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName advisory.wikimedia.org
AllowEncodedSlashes On
@@ -617,7 +617,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/advisory/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -630,12 +630,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/advisory/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/advisory/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -644,7 +644,7 @@
# auditcom private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/auditcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName auditcom.wikimedia.org
AllowEncodedSlashes On
@@ -654,7 +654,7 @@
RewriteRule ^/(.*)$ https://auditcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/auditcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -662,12 +662,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/auditcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/auditcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -677,16 +677,15 @@
# quality private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/quality"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName quality.wikimedia.org
-
AllowEncodedSlashes On
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/quality/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -699,12 +698,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/quality/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/quality/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -714,7 +713,7 @@
# OTRS private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/otrs-wiki"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName otrs-wiki.wikimedia.org
AllowEncodedSlashes On
@@ -724,7 +723,7 @@
RewriteRule ^/(.*)$ https://otrs-wiki.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/otrs-wiki/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -732,12 +731,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/otrs-wiki/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/otrs-wiki/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -746,7 +745,7 @@
# Executive director's private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/exec"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName exec.wikimedia.org
AllowEncodedSlashes On
@@ -756,7 +755,7 @@
RewriteRule ^/(.*)$ https://exec.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/exec/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -764,12 +763,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/exec/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/exec/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -778,7 +777,7 @@
# Private wiki for Jay and his minions
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/collab"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName collab.wikimedia.org
AllowEncodedSlashes On
@@ -788,7 +787,7 @@
RewriteRule ^/(.*)$ https://collab.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/collab/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -796,12 +795,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/collab/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/collab/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -810,7 +809,7 @@
# Outreach Wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/outreach"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName outreach.wikimedia.org
AllowEncodedSlashes On
@@ -818,7 +817,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/outreach/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -831,12 +830,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/outreach/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/outreach/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -845,7 +844,7 @@
#movementroles wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/movementroles"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName movementroles.wikimedia.org
AllowEncodedSlashes On
@@ -855,7 +854,7 @@
RewriteRule ^/(.*)$ https://movementroles.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/movementroles/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -863,12 +862,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/movementroles/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/movementroles/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -877,7 +876,7 @@
# checkuser private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/checkuser"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName checkuser.wikimedia.org
AllowEncodedSlashes On
@@ -887,7 +886,7 @@
RewriteRule ^/(.*)$ https://checkuser.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/checkuser/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -895,12 +894,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/checkuser/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/checkuser/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -909,7 +908,7 @@
# steward private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/steward"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName steward.wikimedia.org
AllowEncodedSlashes On
@@ -919,7 +918,7 @@
RewriteRule ^/(.*)$ https://steward.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/steward/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -927,12 +926,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/steward/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/steward/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -941,7 +940,7 @@
# ombudsmen private wiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/ombudsmen"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName ombudsmen.wikimedia.org
AllowEncodedSlashes On
@@ -951,7 +950,7 @@
RewriteRule ^/(.*)$ https://ombudsmen.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/ombudsmen/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -959,12 +958,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/ombudsmen/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/ombudsmen/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 3539b00..ab85a2c 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -92,7 +92,7 @@
# loginwiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/login"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName login.wikimedia.org
AllowEncodedSlashes On
@@ -100,18 +100,18 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/login/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/login/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/login/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -120,7 +120,7 @@
# transitionteam private wiki - RT-4850
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/transitionteam"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName transitionteam.wikimedia.org
AllowEncodedSlashes On
@@ -130,7 +130,7 @@
RewriteRule ^/(.*)$ https://transitionteam.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/transitionteam/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -138,12 +138,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/transitionteam/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/transitionteam/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -152,7 +152,7 @@
# iegcom private wiki - RT-5042
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/iegcom"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName iegcom.wikimedia.org
AllowEncodedSlashes On
@@ -162,7 +162,7 @@
RewriteRule ^/(.*)$ https://iegcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/iegcom/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -170,12 +170,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/iegcom/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/iegcom/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/147486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I278f470674aebc2186d52778cadf5f56c763da46
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
