Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311647
Change subject: Follow-up Ifa2cc187: Add ShortUrl support on wikimedia.org
docroot sites
......................................................................
Follow-up Ifa2cc187: Add ShortUrl support on wikimedia.org docroot sites
This is almost certainly not the last wiki site without support for it.
Bug: T146014
Change-Id: If258a076ea02e26dbe2beac23081246eca8b5a2a
---
M modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/311647/1
diff --git a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
index d84d442..36c6ce0 100644
--- a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
+++ b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
@@ -5,6 +5,7 @@
ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.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 /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php
ProxyPass /w/extensions !
ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1 retry=0
RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
@@ -12,6 +13,8 @@
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]
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
--
To view, visit https://gerrit.wikimedia.org/r/311647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If258a076ea02e26dbe2beac23081246eca8b5a2a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
