Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/285367
Change subject: mediawiki::web: drop HHVM define/Zend conditionals in all vhosts
......................................................................
mediawiki::web: drop HHVM define/Zend conditionals in all vhosts
Bug: T126310
Change-Id: I092b20900bdad723a22e77d63c0d8aa9eb955769
---
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/wikimedia.conf
M modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
3 files changed, 70 insertions(+), 226 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/285367/1
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index 95f3e6b..92d65c2 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -57,13 +57,11 @@
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
@@ -72,17 +70,6 @@
Include "sites-enabled/wikidata-uris.incl"
Include "sites-enabled/api-rewrites.incl"
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <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>
# Wikidata
@@ -96,13 +83,11 @@
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
@@ -114,17 +99,6 @@
Include "sites-enabled/wikidata-uris.incl"
Include "sites-enabled/api-rewrites.incl"
Include "sites-enabled/public-wiki-rewrites.incl"
-
- <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>
# Wiktionaries
@@ -141,13 +115,11 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/thumb_handler.php
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/thumb_handler.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -174,17 +146,6 @@
Include "sites-enabled/api-rewrites.incl"
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
@@ -213,14 +174,12 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/thumb_handler.php
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/thumb_handler.php
+ ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -247,17 +206,6 @@
RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php
[R=301,L]
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1
[R=301]
-
- <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
@@ -320,15 +268,13 @@
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/thumb_handler.php
retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/$1 retry=0
- 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/thumb_handler.php
retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/$1 retry=0
+ 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
+
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
@@ -364,17 +310,6 @@
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) %{ENV:RW_PROTO}://stats.wikimedia.org/$2
[R=302,L]
- <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
Alias /sr-ec /srv/mediawiki/docroot/wikipedia.org/w/index.php
@@ -404,14 +339,12 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/thumb_handler.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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/thumb_handler.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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -438,17 +371,6 @@
RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php
[R=301,L]
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1
[R=301]
-
- <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
@@ -477,14 +399,12 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/thumb_handler.php
- 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/thumb_handler.php
+ 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -511,17 +431,6 @@
RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php
[R=301,L]
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1
[R=301]
-
- <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
@@ -550,15 +459,13 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/thumb_handler.php
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php
- 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/thumb_handler.php
+ ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/index.php
+ 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -585,17 +492,6 @@
Include "sites-enabled/api-rewrites.incl"
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
@@ -625,15 +521,13 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/thumb_handler.php
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
- 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/thumb_handler.php
+ ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/index.php
+ 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 ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -661,17 +555,6 @@
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1
[R=301]
- <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
Alias /sr-ec /srv/mediawiki/docroot/wikiversity.org/w/index.php
@@ -697,32 +580,18 @@
RewriteEngine On
- <IfDefine HHVM>
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php
- ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/thumb_handler.php
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/$1
- ProxyPassMatch ^/zh(-(hans|hant|cn|hk|mo|my|sg|tw)) \
-
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/thumb_handler.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/$1
+ ProxyPassMatch ^/zh(-(hans|hant|cn|hk|mo|my|sg|tw))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php
Include "sites-enabled/api-rewrites.incl"
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>
# Variant aliases
Alias /zh /srv/mediawiki/docroot/wikivoyage.org/w/index.php
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 65264b9..145e483 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -38,19 +38,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
diff --git a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
index b945a4d..d84d442 100644
--- a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
+++ b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
@@ -2,18 +2,16 @@
DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
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/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/thumb_handler.php
retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1 retry=0
- 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]
- # /w/wiki.phtml is severely underperforming on HHVM
- RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
- </IfDefine>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
+ ProxyPass /w/thumb_handler.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/thumb_handler.php
retry=0
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1 retry=0
+ 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]
+ # /w/wiki.phtml is severely underperforming on HHVM
+ RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
@@ -26,14 +24,3 @@
RewriteCond %{ENV:RW_PROTO} !=""
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.<%=
@domain_suffix %>/math/$1 [R=301]
RewriteRule ^/math/(.*) https://upload.wikimedia.<%= @domain_suffix
%>/math/$1 [R=301]
-
- <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>
--
To view, visit https://gerrit.wikimedia.org/r/285367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I092b20900bdad723a22e77d63c0d8aa9eb955769
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
