Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147483
Change subject: Apache config for Wikimania wikis using mod_proxy_fcgi
......................................................................
Apache config for Wikimania wikis using mod_proxy_fcgi
Change-Id: Ib95c98e8f6242a9ce6c31e492990cf36f89aeff9
---
M modules/mediawiki/files/apache/sites/wikimania.conf
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/147483/1
diff --git a/modules/mediawiki/files/apache/sites/wikimania.conf
b/modules/mediawiki/files/apache/sites/wikimania.conf
index 4154acd..04a886f 100644
--- a/modules/mediawiki/files/apache/sites/wikimania.conf
+++ b/modules/mediawiki/files/apache/sites/wikimania.conf
@@ -10,6 +10,16 @@
UseCanonicalName Off
RewriteEngine On
+
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/index.php
[P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/robots.php
[P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/favicon.php
[P]
+ </IfDefine>
+
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
@@ -60,6 +70,16 @@
AllowEncodedSlashes On
RewriteEngine On
+
+ <IfDefine HHVM>
+ ProxyPass /wiki
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/index.php
+ ProxyPass /w/extensions !
+ ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/$1
+ RewriteRule ^/$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/index.php
[P]
+ RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/robots.php
[P]
+ RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/usr/local/apache/common/docroot/wikimedia.org/w/favicon.php
[P]
+ </IfDefine>
+
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule ^/(.*)$ https://wikimaniateam.wikimedia.org/$1 [R=301,L]
--
To view, visit https://gerrit.wikimedia.org/r/147483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib95c98e8f6242a9ce6c31e492990cf36f89aeff9
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
