Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Revert "apache: Standardise ShortURL config per Giuseppe on
If258a076"
......................................................................
Revert "apache: Standardise ShortURL config per Giuseppe on If258a076"
This reverts commit 7edca169702b0fc03e06fbf8732e3c7ae3c9befd.
Change-Id: I567cd1439f22b17a07e37ee995869677536f6d36
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 24 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index e1ad066..92d65c2 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -117,10 +117,12 @@
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/wiktionary.org/w/thumb_handler.php
- ProxyPass /s/
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]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -174,10 +176,13 @@
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 /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]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -265,7 +270,6 @@
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/wikipedia.org/w/thumb_handler.php
retry=0
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php
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))
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.php retry=0
@@ -275,6 +279,9 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# The rest are served by the upload cluster
# First grab the subdomain from HTTP_HOST
@@ -334,11 +341,13 @@
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/wikibooks.org/w/thumb_handler.php
retry=0
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php
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]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -392,11 +401,13 @@
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/wikisource.org/w/thumb_handler.php
- ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
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]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -450,11 +461,14 @@
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 /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
RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
+
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -509,12 +523,15 @@
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 /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
RewriteRule ^/w/wiki.phtml$ /w/index.php [L,QSA,NE]
+ # ShortURL redirect RT-2121
+ RewriteRule ^/s/.*$ /w/index.php
+
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikiversity\.org
--
To view, visit https://gerrit.wikimedia.org/r/317466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I567cd1439f22b17a07e37ee995869677536f6d36
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
