[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::web: Add ShortUrl support on wikimedia.org docroo...

2016-10-24 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: mediawiki::web: Add ShortUrl support on wikimedia.org docroot 
sites
..


mediawiki::web: Add ShortUrl support on wikimedia.org docroot sites

This is an alternate version of If258a076 using the RewriteRule (that
works) instead of ProxyPass (that does not).

Bug: T146014
Change-Id: Ib00621ebe715932a9ceeaf7e8bd6494a338087ad
---
M modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb 
b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
index d84d442..b0f42a2 100644
--- a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
+++ b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
@@ -24,3 +24,6 @@
 RewriteCond %{ENV:RW_PROTO} !=""
 RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.<%= 
@domain_suffix %>/math/$1 [R=301]
 RewriteRule ^/math/(.*) https://upload.wikimedia.<%= @domain_suffix 
%>/math/$1 [R=301]
+
+# ShortUrl support, for wikis where it's enabled
+RewriteRule ^/s/.*$ /w/index.php 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib00621ebe715932a9ceeaf7e8bd6494a338087ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::web: Add ShortUrl support on wikimedia.org docroo...

2016-10-24 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki::web: Add ShortUrl support on wikimedia.org docroot 
sites
..

mediawiki::web: Add ShortUrl support on wikimedia.org docroot sites

This is an alternate version of If258a076 using the RewriteRule (that
works) instead of ProxyPass (that does not).

Bug: T146014
Change-Id: Ib00621ebe715932a9ceeaf7e8bd6494a338087ad
---
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/69/317469/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..b0f42a2 100644
--- a/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
+++ b/modules/mediawiki/templates/apache/sites/wikimedia-common.incl.erb
@@ -24,3 +24,6 @@
 RewriteCond %{ENV:RW_PROTO} !=""
 RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.<%= 
@domain_suffix %>/math/$1 [R=301]
 RewriteRule ^/math/(.*) https://upload.wikimedia.<%= @domain_suffix 
%>/math/$1 [R=301]
+
+# ShortUrl support, for wikis where it's enabled
+RewriteRule ^/s/.*$ /w/index.php 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib00621ebe715932a9ceeaf7e8bd6494a338087ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits