Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/90703
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 main.conf
M remnant.conf
M wikimedia.conf
3 files changed, 132 insertions(+), 132 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/03/90703/1
diff --git a/main.conf b/main.conf
index 2fd6b30..007b815 100644
--- a/main.conf
+++ b/main.conf
@@ -56,7 +56,7 @@
<VirtualHost *>
ServerName test.wikidata.org
- DocumentRoot "/usr/local/apache/common/docroot/testwikidata"
+ DocumentRoot "/usr/local/apache/common/docroot/wikidata"
AllowEncodedSlashes On
@@ -66,19 +66,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>
@@ -271,12 +271,12 @@
<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
# 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
@@ -292,12 +292,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>
@@ -307,12 +307,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
@@ -320,12 +320,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/remnant.conf b/remnant.conf
index a1b0734..91af018 100644
--- a/remnant.conf
+++ b/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
@@ -11,7 +11,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
@@ -31,12 +31,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>
@@ -45,7 +45,7 @@
# Wikisource
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/sources"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName wikisource.org
AllowEncodedSlashes On
@@ -53,7 +53,7 @@
RewriteEngine On
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/sources/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -69,12 +69,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/sources/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/sources/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -124,7 +124,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
@@ -134,7 +134,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
# UseMod compatibility URLs
@@ -147,12 +147,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>
@@ -161,7 +161,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
@@ -171,7 +171,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
# UseMod compatibility URLs
@@ -184,12 +184,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>
@@ -198,7 +198,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
@@ -208,7 +208,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
# UseMod compatibility URLs
@@ -221,12 +221,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>
@@ -235,7 +235,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
@@ -245,7 +245,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
# UseMod compatibility URLs
@@ -258,12 +258,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>
@@ -272,7 +272,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
@@ -282,7 +282,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
# UseMod compatibility URLs
@@ -295,12 +295,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>
@@ -309,7 +309,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
@@ -319,7 +319,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
# UseMod compatibility URLs
@@ -332,12 +332,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>
@@ -346,7 +346,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
@@ -356,7 +356,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
# UseMod compatibility URLs
@@ -369,12 +369,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>
@@ -383,7 +383,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
@@ -391,7 +391,7 @@
RewriteEngine On
# 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
@@ -404,12 +404,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>
@@ -418,7 +418,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
@@ -426,7 +426,7 @@
RewriteEngine On
# 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
@@ -442,12 +442,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>
@@ -456,7 +456,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
@@ -466,7 +466,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
# UseMod compatibility URLs
@@ -479,12 +479,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>
@@ -528,7 +528,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
@@ -536,7 +536,7 @@
RewriteEngine On
# 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
@@ -549,12 +549,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>
@@ -563,7 +563,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
@@ -573,7 +573,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
# UseMod compatibility URLs
@@ -586,12 +586,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>
@@ -601,7 +601,7 @@
# nomcom private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/nomcom"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName nomcom.wikimedia.org
AllowEncodedSlashes On
@@ -611,7 +611,7 @@
RewriteRule ^/(.*)$ https://nomcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/nomcom/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -624,12 +624,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/usr/local/apache/common/docroot/nomcom/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/nomcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -638,7 +638,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
@@ -648,7 +648,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
# UseMod compatibility URLs
@@ -661,12 +661,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>
@@ -675,7 +675,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
@@ -683,7 +683,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
@@ -696,12 +696,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>
@@ -710,7 +710,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
@@ -720,7 +720,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
# UseMod compatibility URLs
@@ -733,12 +733,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>
@@ -748,7 +748,7 @@
# quality private wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/quality"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName quality.wikimedia.org
AllowEncodedSlashes On
@@ -756,7 +756,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
@@ -769,12 +769,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>
@@ -784,7 +784,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
@@ -794,7 +794,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
# UseMod compatibility URLs
@@ -807,12 +807,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>
@@ -821,7 +821,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
@@ -831,7 +831,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
# UseMod compatibility URLs
@@ -844,12 +844,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>
@@ -858,7 +858,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
@@ -868,7 +868,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
# UseMod compatibility URLs
@@ -881,12 +881,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>
@@ -895,7 +895,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
@@ -903,7 +903,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
@@ -916,12 +916,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>
@@ -930,7 +930,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
@@ -940,7 +940,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
# UseMod compatibility URLs
@@ -953,12 +953,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>
@@ -967,7 +967,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
@@ -977,7 +977,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
# UseMod compatibility URLs
@@ -990,12 +990,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>
@@ -1004,7 +1004,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
@@ -1014,7 +1014,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
# UseMod compatibility URLs
@@ -1027,12 +1027,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>
@@ -1041,7 +1041,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
@@ -1051,7 +1051,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
# UseMod compatibility URLs
@@ -1064,12 +1064,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/wikimedia.conf b/wikimedia.conf
index 2ea446d..643c0e0 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -91,7 +91,7 @@
# loginwiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/login"
+ DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
ServerName login.wikimedia.org
AllowEncodedSlashes On
@@ -99,18 +99,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>
@@ -119,7 +119,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
@@ -129,7 +129,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
# UseMod compatibility URLs
@@ -142,12 +142,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>
@@ -156,7 +156,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
@@ -166,7 +166,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
# UseMod compatibility URLs
@@ -179,12 +179,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/90703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I278f470674aebc2186d52778cadf5f56c763da46
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
