Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394203 )
Change subject: Beta: Moving all docroots to standard-docroot
......................................................................
Beta: Moving all docroots to standard-docroot
Now that we've unified all the docroots, let's start to actually
use the unified docroots instead of symlinking everywhere
Bug: T126306
Change-Id: Iba9b3cfe6017bf2a1b0472ccabf31940b3ecbcf3
---
M modules/mediawiki/files/apache/beta/sites/wikibooks.conf
M modules/mediawiki/files/apache/beta/sites/wikidata.conf
M modules/mediawiki/files/apache/beta/sites/wikinews.conf
M modules/mediawiki/files/apache/beta/sites/wikiquote.conf
M modules/mediawiki/files/apache/beta/sites/wikisource.conf
M modules/mediawiki/files/apache/beta/sites/wikiversity.conf
M modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
M modules/mediawiki/files/apache/beta/sites/wiktionary.conf
8 files changed, 122 insertions(+), 122 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
index 0bd7de1..38bc582 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
@@ -2,32 +2,32 @@
ServerName wikibooks
ServerAlias *.wikibooks.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikibooks.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikibooks.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wikibooks.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wikibooks.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
index 523af0d..d746bef 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
@@ -2,20 +2,20 @@
ServerName wikidata
ServerAlias wikidata.beta.wmflabs.org *.wikidata.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikidata.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata.org/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikidata.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
RewriteRule ^/w/$ /w/index.php
# rewrite /entity/ URLs for wikidata per
diff --git a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
index f05c44e..cdf5bd9 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
@@ -2,32 +2,32 @@
ServerName wikinews
ServerAlias *.wikinews.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikinews.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikinews.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wikinews.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wikinews.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
index 36be6bc..53d87f0 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
@@ -2,32 +2,32 @@
ServerName wikiquote
ServerAlias *.wikiquote.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikiquote.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikiquote.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wikiquote.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wikiquote.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
index 5f9cf67..862b477 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
@@ -2,32 +2,32 @@
ServerName wikisource
ServerAlias *.wikisource.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikisource.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikisource.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wikisource.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wikisource.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
index 5331d4d..4557035 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
@@ -2,32 +2,32 @@
ServerName wikiversity
ServerAlias *.wikiversity.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikiversity.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikiversity.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wikiversity.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wikiversity.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
index fce9a93..68f2611 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
@@ -2,19 +2,19 @@
ServerName wikivoyage
ServerAlias *.wikivoyage.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikivoyage.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
index 455b864..bea0d5e 100644
--- a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
@@ -2,32 +2,32 @@
ServerName wiktionary
ServerAlias *.wiktionary.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wiktionary.org"
+ DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php [P]
# Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wiktionary.org/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
# Variant aliases
- Alias /sr /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /sr-ec /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /sr-el /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-hans /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-hant /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-cn /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-hk /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-sg /srv/mediawiki/docroot/wiktionary.org/w/index.php
- Alias /zh-tw /srv/mediawiki/docroot/wiktionary.org/w/index.php
+ Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+ Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/394203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba9b3cfe6017bf2a1b0472ccabf31940b3ecbcf3
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
