Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki: rewrite /w/wiki.phtml on HHVM ......................................................................
mediawiki: rewrite /w/wiki.phtml on HHVM Turns out HHVM is extremely slow in serving /w/wiki.phtml, and it has other issues as well. So the easiest way to keep serving that correctly is rewriting it to index.php Change-Id: I86ef10ddc7d0de7537681988c0f988a3ff5c5bc4 Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M modules/mediawiki/files/apache/sites/main.conf M modules/mediawiki/files/apache/sites/wikimedia-common.incl 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved Alexandros Kosiaris: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index eda64be..df1f752 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -29,6 +29,7 @@ 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 + RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE] </IfDefine> @@ -76,6 +77,7 @@ 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 + RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE] </IfDefine> # Make robots.txt editable via Mediawiki:robots.txt @@ -119,6 +121,7 @@ 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 + RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE] </IfDefine> # Primary wiki redirector: @@ -164,6 +167,7 @@ ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.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> @@ -240,6 +244,7 @@ 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> @@ -356,6 +361,7 @@ 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> RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}] @@ -450,7 +456,7 @@ 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> # Make robots.txt editable via Mediawiki:robots.txt @@ -530,6 +536,7 @@ 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> @@ -611,6 +618,7 @@ 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> RewriteCond %{HTTP_HOST} ^ru\.wikinews\.org$ @@ -696,6 +704,7 @@ 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> @@ -775,6 +784,7 @@ 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> # Make robots.txt editable via Mediawiki:robots.txt diff --git a/modules/mediawiki/files/apache/sites/wikimedia-common.incl b/modules/mediawiki/files/apache/sites/wikimedia-common.incl index 8630948..ce98e50 100644 --- a/modules/mediawiki/files/apache/sites/wikimedia-common.incl +++ b/modules/mediawiki/files/apache/sites/wikimedia-common.incl @@ -9,6 +9,8 @@ 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> -- To view, visit https://gerrit.wikimedia.org/r/189697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86ef10ddc7d0de7537681988c0f988a3ff5c5bc4 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
