Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159490
Change subject: mediawiki: add HHVM proxy rules in main.conf
......................................................................
mediawiki: add HHVM proxy rules in main.conf
Change-Id: I169a954ba9ca6767ed0fa50f641d016eff4f8f4e
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 78 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/159490/1
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index e82f37c..365eac1 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -25,6 +25,13 @@
# Our FAQ
RewriteRule ^/FAQ$ %{ENV:RW_PROTO}://www.mediawiki.org/wiki/Help:FAQ
[R=301,L]
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/$1
+ </IfDefine>
+
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php
RewriteRule ^/$ /w/index.php
@@ -69,9 +76,6 @@
ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php
ProxyPass /w/extensions !
ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/favicon.php [P]
</IfDefine>
# Make robots.txt editable via Mediawiki:robots.txt
@@ -111,6 +115,12 @@
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+ </IfDefine>
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
Alias /ontology
/srv/mediawiki/docroot/wikidata/w/extensions/Wikibase/docs/ontology.owl
@@ -149,6 +159,13 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/$1
+ </IfDefine>
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -217,6 +234,14 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php
+ ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/$1
+ </IfDefine>
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -292,6 +317,13 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/donate/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/donate/w/$1
+ </IfDefine>
+
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/donate/w/index.php
@@ -327,6 +359,13 @@
DocumentRoot "/srv/mediawiki/docroot/vote"
AllowEncodedSlashes On
RewriteEngine On
+
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/vote/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/vote/w/$1
+ </IfDefine>
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/vote/w/index.php
@@ -366,9 +405,6 @@
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 ^/$
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>
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
@@ -458,6 +494,14 @@
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/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
+
+ </IfDefine>
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -529,6 +573,14 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
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/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
+ </IfDefine>
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -602,6 +654,16 @@
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 /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
+ </IfDefine>
+
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -674,6 +736,16 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
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 /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
+ </IfDefine>
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -751,9 +823,6 @@
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 ^/$
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>
# Make robots.txt editable via Mediawiki:robots.txt
--
To view, visit https://gerrit.wikimedia.org/r/159490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I169a954ba9ca6767ed0fa50f641d016eff4f8f4e
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
