Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki::web: use Rewrites for ShortUrl extension
......................................................................
mediawiki::web: use Rewrites for ShortUrl extension
In general, ProxyPass and RewriteRule are almost equivalent, and they're
surely redundant once both are declared. Actually, given the ProxyPass
alone didn't work and ProxyPass directives get processed before
RewriteRules one could imagine that this change could fix a few cases.
Bug: T146014
Change-Id: Ic2c0769d8d5464ab3058fc673504d10e38fde15e
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index 92d65c2..1606688 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -176,7 +176,6 @@
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]
@@ -461,7 +460,6 @@
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
@@ -523,7 +521,6 @@
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
--
To view, visit https://gerrit.wikimedia.org/r/317467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2c0769d8d5464ab3058fc673504d10e38fde15e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
