Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147486
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, 128 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/147486/1
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index 3e76a6a..c9cad5c 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -59,7 +59,7 @@
<VirtualHost *>
ServerName test.wikidata.org
- DocumentRoot "/usr/local/apache/common/docroot/testwikidata"
+ DocumentRoot "/usr/local/apache/common/docroot/wikidata"
AllowEncodedSlashes On
@@ -69,19 +69,19 @@
RewriteRule ^/robots.txt$ /w/robots.php [L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/testwikidata/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikidata/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/testwikidata/w">
+ <Directory "/usr/local/apache/common/docroot/wikidata/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/usr/local/apache/common/docroot/testwikidata/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikidata/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -275,7 +275,7 @@
<VirtualHost *>
ServerName donate.wikimedia.org
ServerAlias donate.wikipedia.org
- DocumentRoot "/usr/local/apache/common/docroot/donate"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
@@ -284,7 +284,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/donate/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
# Push to SSL
RewriteCond %{HTTP:X-Forwarded-Proto} !https
@@ -300,12 +300,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/donate/w">
+ <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/donate/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -315,12 +315,12 @@
<VirtualHost *>
ServerName vote.wikimedia.org
- DocumentRoot "/usr/local/apache/common/docroot/vote"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/vote/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
@@ -328,12 +328,12 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://vote.wikimedia.org%{REQUEST_URI} [R=301]
- <Directory "/usr/local/apache/common/docroot/vote/w">
+ <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/vote/w/extensions">
+ <Directory "/usr/local/apache/common/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 ee179ab..4e95071 100644
--- a/modules/mediawiki/files/apache/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/sites/remnant.conf
@@ -1,6 +1,6 @@
# Meta
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/meta"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/meta/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/meta/w">
+ <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/meta/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -48,7 +48,7 @@
# Wikisource
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/sources"
+ DocumentRoot "/usr/local/apache/common/docroot/wikisource.org"
ServerName wikisource.org
AllowEncodedSlashes On
@@ -59,7 +59,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/sources/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/sources/w">
+ <Directory "/usr/local/apache/common/docroot/wikisource.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/usr/local/apache/common/docroot/sources/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikisource.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -133,7 +133,7 @@
# Internal grants wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/grants"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/grants/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/grants/w">
+ <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/grants/w/extensions">
+ <Directory "/usr/local/apache/common/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 *>
- DocumentRoot "/usr/local/apache/common/docroot/fdc"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/fdc/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/fdc/w">
+ <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/fdc/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -197,7 +197,7 @@
# Internal wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/internal"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/internal/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/internal/w">
+ <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/internal/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -229,7 +229,7 @@
# Board wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/board"
+ DocumentRoot /usr/local/apache/common/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 /usr/local/apache/common/docroot/board/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/board/w">
+ <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/board/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -261,7 +261,7 @@
# Board Governance Committee
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/boardgovcom"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/boardgovcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/boardgovcom/w">
+ <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/boardgovcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -293,7 +293,7 @@
# Spcom wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/spcom"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/spcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/spcom/w">
+ <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/spcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -325,7 +325,7 @@
# Chapcom wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/chapcom"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/chapcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/chapcom/w">
+ <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/chapcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -357,7 +357,7 @@
# Incubator wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/incubator"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName incubator.wikimedia.org
AllowEncodedSlashes On
@@ -368,7 +368,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/incubator/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/incubator/w">
+ <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/incubator/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -395,7 +395,7 @@
# WikiSpecies wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/species"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName species.wikimedia.org
AllowEncodedSlashes On
@@ -406,7 +406,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/species/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/species/w">
+ <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/species/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -436,7 +436,7 @@
# search committee private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/searchcom"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/searchcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/searchcom/w">
+ <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/searchcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -506,7 +506,7 @@
# strategy wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/strategy"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName strategy.wikimedia.org
AllowEncodedSlashes On
@@ -517,7 +517,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/strategy/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/strategy/w">
+ <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/strategy/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -544,7 +544,7 @@
# office private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/office"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/office/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/office/w">
+ <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/office/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -577,7 +577,7 @@
# chair private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/chair"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/chair/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/chair/w">
+ <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/chair/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -609,7 +609,7 @@
# advisory board PUBLIC wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/advisory"
+ DocumentRoot /usr/local/apache/common/docroot/wikimedia.org
ServerName advisory.wikimedia.org
AllowEncodedSlashes On
@@ -617,7 +617,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/advisory/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/advisory/w">
+ <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/advisory/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -644,7 +644,7 @@
# auditcom private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/auditcom"
+ DocumentRoot /usr/local/apache/common/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 /usr/local/apache/common/docroot/auditcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/auditcom/w">
+ <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/auditcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -677,7 +677,7 @@
# quality private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/quality"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName quality.wikimedia.org
@@ -686,7 +686,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/quality/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -699,12 +699,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/quality/w">
+ <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/quality/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -714,7 +714,7 @@
# OTRS private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/otrs-wiki"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName otrs-wiki.wikimedia.org
AllowEncodedSlashes On
@@ -724,7 +724,7 @@
RewriteRule ^/(.*)$ https://otrs-wiki.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/otrs-wiki/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -732,12 +732,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/otrs-wiki/w">
+ <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/otrs-wiki/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -746,7 +746,7 @@
# Executive director's private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/exec"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName exec.wikimedia.org
AllowEncodedSlashes On
@@ -756,7 +756,7 @@
RewriteRule ^/(.*)$ https://exec.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/exec/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -764,12 +764,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/exec/w">
+ <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/exec/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -778,7 +778,7 @@
# Private wiki for Jay and his minions
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/collab"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName collab.wikimedia.org
AllowEncodedSlashes On
@@ -788,7 +788,7 @@
RewriteRule ^/(.*)$ https://collab.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/collab/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -796,12 +796,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/collab/w">
+ <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/collab/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -810,7 +810,7 @@
# Outreach Wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/outreach"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName outreach.wikimedia.org
AllowEncodedSlashes On
@@ -818,7 +818,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/outreach/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -831,12 +831,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/outreach/w">
+ <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/outreach/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -845,7 +845,7 @@
#movementroles wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/movementroles"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName movementroles.wikimedia.org
AllowEncodedSlashes On
@@ -855,7 +855,7 @@
RewriteRule ^/(.*)$ https://movementroles.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/movementroles/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -863,12 +863,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/movementroles/w">
+ <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/movementroles/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -877,7 +877,7 @@
# checkuser private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/checkuser"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName checkuser.wikimedia.org
AllowEncodedSlashes On
@@ -887,7 +887,7 @@
RewriteRule ^/(.*)$ https://checkuser.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/checkuser/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -895,12 +895,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/checkuser/w">
+ <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/checkuser/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -909,7 +909,7 @@
# steward private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/steward"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName steward.wikimedia.org
AllowEncodedSlashes On
@@ -919,7 +919,7 @@
RewriteRule ^/(.*)$ https://steward.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/steward/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -927,12 +927,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/steward/w">
+ <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/steward/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -941,7 +941,7 @@
# ombudsmen private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/ombudsmen"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName ombudsmen.wikimedia.org
AllowEncodedSlashes On
@@ -951,7 +951,7 @@
RewriteRule ^/(.*)$ https://ombudsmen.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/ombudsmen/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
@@ -959,12 +959,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/ombudsmen/w">
+ <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/ombudsmen/w/extensions">
+ <Directory "/usr/local/apache/common/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 ca7c04b..d318beb 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -92,7 +92,7 @@
# loginwiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/login"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName login.wikimedia.org
AllowEncodedSlashes On
@@ -100,18 +100,18 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/login/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/login/w">
+ <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/login/w/extensions">
+ <Directory "/usr/local/apache/common/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 *>
- DocumentRoot "/usr/local/apache/common/docroot/transitionteam"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/transitionteam/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/transitionteam/w">
+ <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/transitionteam/w/extensions">
+ <Directory "/usr/local/apache/common/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 *>
- DocumentRoot "/usr/local/apache/common/docroot/iegcom"
+ DocumentRoot "/usr/local/apache/common/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 /usr/local/apache/common/docroot/iegcom/w/index.php
+ Alias /wiki /usr/local/apache/common/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 "/usr/local/apache/common/docroot/iegcom/w">
+ <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/iegcom/w/extensions">
+ <Directory "/usr/local/apache/common/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: newchange
Gerrit-Change-Id: I278f470674aebc2186d52778cadf5f56c763da46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
