Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315522

Change subject: apache: Standardise ShortURL config per Giuseppe on If258a076
......................................................................

apache: Standardise ShortURL config per Giuseppe on If258a076

This issue blocks copying of the config to new VHosts.

Change-Id: Iddb794748c8c84036149b68dd2ff2286ae6e3d8f
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 7 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/315522/1

diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index 92d65c2..e1ad066 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -117,12 +117,10 @@
 
     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
@@ -176,13 +174,10 @@
 
     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
@@ -270,6 +265,7 @@
 
     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
@@ -279,9 +275,6 @@
     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
@@ -341,13 +334,11 @@
 
     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
@@ -401,13 +392,11 @@
 
     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
@@ -461,14 +450,11 @@
 
     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
@@ -523,14 +509,11 @@
 
     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

-- 
To view, visit https://gerrit.wikimedia.org/r/315522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb794748c8c84036149b68dd2ff2286ae6e3d8f
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

Reply via email to