Ori.livneh has submitted this change and it was merged.
Change subject: Follow-up for Ie17cb06: add thumb_handler.php ProxyPass rule to
all vhosts
......................................................................
Follow-up for Ie17cb06: add thumb_handler.php ProxyPass rule to all vhosts
Bug: T84842
Bug: T106743
Change-Id: I9da3c2bb860cd361cb8c65a6b753de2fc2dbdd1d
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
Objections:
Giuseppe Lavagetto: There's a problem with this change, please improve
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index b6d12fb..594dbb5 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -27,6 +27,7 @@
<IfDefine HHVM>
ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/index.php
+ 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/mediawiki/w/$1
RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
@@ -75,6 +76,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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]
@@ -119,6 +121,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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]
@@ -165,6 +168,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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]
@@ -241,6 +245,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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
@@ -357,6 +362,7 @@
<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/wikimedia.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)) \
@@ -449,6 +455,7 @@
<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/wikimedia.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
@@ -529,6 +536,7 @@
<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/wikimedia.org/w/thumb_handler.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
@@ -610,6 +618,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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
@@ -696,6 +705,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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
@@ -776,6 +786,7 @@
<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/wikimedia.org/w/thumb_handler.php
retry=0
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)) \
--
To view, visit https://gerrit.wikimedia.org/r/226738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9da3c2bb860cd361cb8c65a6b753de2fc2dbdd1d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[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
