Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki::web: drop the HHVM/Zend conditionals from beta sites
......................................................................
mediawiki::web: drop the HHVM/Zend conditionals from beta sites
Bug: T126310
Change-Id: I1a4da413a535c27e3a8c2a154acdb92b92c9ba7d
---
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
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/wikimedia.conf
M modules/mediawiki/files/apache/beta/sites/wikinews.conf
M modules/mediawiki/files/apache/beta/sites/wikipedia.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
M modules/mediawiki/files/apache/beta/sites/wmflabs.conf
14 files changed, 98 insertions(+), 311 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
index 3f2692f..4782c91 100644
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
@@ -5,14 +5,12 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- 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/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>
+ 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/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]
#RewriteCond %{HTTP:X-Forwarded-Proto} !https
#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
@@ -21,14 +19,4 @@
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index 56f1a99..ea30121 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -6,29 +6,16 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/favicon.php [P]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/favicon.php [P]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/commons/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/commons/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/commons/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
# Meta
@@ -39,29 +26,16 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- 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/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>
+ 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/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
# Labs
@@ -72,27 +46,14 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php [P]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php [P]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/labs/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/labs/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/labs/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
index 4b76865..112cdfe 100644
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
@@ -7,27 +7,14 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- 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/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>
+ 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/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
- <IfModule mod_php5.c>e
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
index 68277cf..0bd7de1 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikibooks.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikibooks.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikibooks.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikibooks.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
index 226fd6e..3b55293 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
@@ -7,29 +7,16 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
RewriteRule ^/w/$ /w/index.php
-
- <Directory "/srv/mediawiki/docroot/wikidata/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikidata/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index d2c0ab4..000b8c1 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -5,27 +5,14 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- 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/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>
+ 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/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
index c588ab4..f05c44e 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikinews.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikinews.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikinews.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikinews.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
index 826db32..3db802e 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
@@ -7,16 +7,13 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) \
-
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/favicon.php [P]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php [P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/robots.php [P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/favicon.php [P]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikipedia.org/w/index.php
@@ -25,17 +22,6 @@
# Redirect commons.wikipedia to commons.wikimedia
RewriteCond %{HTTP_HOST} =commons.wikipedia.beta.wmflabs.org
RewriteRule ^(.*)$ http://commons.wikimedia.beta.wmflabs.org$1 [R=301,L,NE]
-
- <Directory "/srv/mediawiki/docroot/wikipedia.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikipedia.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikipedia.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
index 0b65515..36be6bc 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikiquote.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikiquote.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikiquote.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikiquote.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
index 80de9e8..5f9cf67 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikisource.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikisource.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikisource.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikisource.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
index f429f2d..5331d4d 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikiversity.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikiversity.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikiversity.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wikiversity.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
index 1b99c02..fce9a93 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
@@ -7,27 +7,14 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wikivoyage.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wikivoyage.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
index 137d50f..455b864 100644
--- a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
@@ -7,31 +7,17 @@
AllowEncodedSlashes On
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/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]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/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]
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wiktionary.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <Directory "/srv/mediawiki/docroot/wiktionary.org/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/wiktionary.org/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
# Variant aliases
Alias /sr /srv/mediawiki/docroot/wiktionary.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
b/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
index 22cd7d2..d64ab93 100644
--- a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
@@ -10,19 +10,7 @@
Alias /images/ /srv/mediawiki/images/
# Handle error pages correctly if mod_php is absent
- <IfDefine HHVM>
- ProxyPass /w/404.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
- </IfDefine>
- <Directory "/srv/mediawiki/docroot/bits/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/srv/mediawiki/docroot/bits/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
+ ProxyPass /w/404.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
# Used for Firefox OS web application manifest living on bits.wikimedia.org
AddType application/x-web-app-manifest+json .webapp
--
To view, visit https://gerrit.wikimedia.org/r/285366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4da413a535c27e3a8c2a154acdb92b92c9ba7d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
