Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165649
Change subject: Fix beta docroots to use docroot/wikimedia.org
......................................................................
Fix beta docroots to use docroot/wikimedia.org
Change-Id: I5743e46e8d218939708d6d823e30919bdab4a637
---
M modules/mediawiki/files/apache/beta/sites/loginwiki.conf
M modules/mediawiki/files/apache/beta/sites/remnant.conf
M modules/mediawiki/files/apache/beta/sites/testwiki.conf
3 files changed, 45 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/165649/1
diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
index a2ad348..18e3572 100644
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
@@ -1,6 +1,6 @@
# loginwiki
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/login"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName login.wikimedia.beta.wmflabs.org
AllowEncodedSlashes On
@@ -8,30 +8,30 @@
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/login/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/login/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/login/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/login/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/login/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
#RewriteCond %{HTTP:X-Forwarded-Proto} !https
#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/login/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
- <Directory "/srv/mediawiki/docroot/login/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/login/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index d324d57..36177c5 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -38,7 +38,7 @@
# Meta
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/meta"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName meta.wikimedia.beta.wmflabs.org
AllowEncodedSlashes On
@@ -46,19 +46,19 @@
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/meta/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/meta/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/meta/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/meta/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/meta/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/meta/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -70,12 +70,12 @@
# Early phase 2 compatibility URLs
RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
- <Directory "/srv/mediawiki/docroot/meta/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/meta/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -83,7 +83,7 @@
</VirtualHost>
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/incubator"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName incubator.wikimedia.beta.wmflabs.org
AllowEncodedSlashes On
@@ -91,15 +91,15 @@
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/incubator/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/incubator/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/incubator/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/incubator/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/incubator/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
- Alias /wiki /srv/mediawiki/docroot/incubator/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteCond %{QUERY_STRING} ([^&;]+)
RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
@@ -107,12 +107,12 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- <Directory "/srv/mediawiki/docroot/incubator/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/incubator/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
@@ -156,7 +156,7 @@
</VirtualHost>
# ee-prototype
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/ee-prototype"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
ServerName ee-prototype.beta.wmflabs.org
AllowEncodedSlashes On
@@ -164,28 +164,28 @@
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/ee-prototype/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/ee-prototype/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/ee-prototype/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/ee-prototype/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/ee-prototype/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
RewriteRule ^/robots.txt$ /w/robots.php [L]
- Alias /wiki /srv/mediawiki/docroot/ee-prototype/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteCond %{QUERY_STRING} ([^&;]+)
RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
- <Directory "/srv/mediawiki/docroot/ee-prototype/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/ee-prototype/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
index 3d2b557..4b2169b 100644
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
@@ -2,19 +2,19 @@
ServerName wikinews
ServerAlias test.wikimedia.beta.wmflabs.org
UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/test"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
<IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/test/w/index.php retry=0
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/test/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/test/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/test/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/test/w/favicon.php [P]
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
# First grab the subdomain from HTTP_HOST
@@ -23,7 +23,7 @@
# RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikibooks/%1/$1
[R=302]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/test/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -36,12 +36,12 @@
# RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- <Directory "/srv/mediawiki/docroot/test/w">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/test/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
<IfModule mod_php5.c>e
php_admin_flag engine off
</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/165649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5743e46e8d218939708d6d823e30919bdab4a637
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
