[MediaWiki-commits] [Gerrit] Fix mobile direct for m.* langs - T115191 - change (operations/puppet)

2015-10-13 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: Fix mobile direct for m.* langs - T115191
..

Fix mobile direct for m.* langs - T115191

Change-Id: I935b164b0a0d387f9538d6cc7b7d7d0b1b6707cc
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/245891/1

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 222d450..ca9f2f4 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -36,7 +36,7 @@
set req.http.MobileHost = req.http.Host;
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(www\.)?(mediawiki|wikimediafoundation|wikisource|wikidata)\.", "m.\2.");
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(commons|incubator|legalteam|meta|office|outreach|pl|species|strategy|wikimania201[2-5])\.(wikimedia)\.",
 "\1.m.\2.");
-   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
+   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m\b)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
 
if (req.http.Host != req.http.MobileHost) {
if (req.http.X-Forwarded-Proto) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I935b164b0a0d387f9538d6cc7b7d7d0b1b6707cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Fix mobile direct for m.* langs - T115191 - change (operations/puppet)

2015-10-13 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: Fix mobile direct for m.* langs - T115191
..


Fix mobile direct for m.* langs - T115191

Change-Id: I935b164b0a0d387f9538d6cc7b7d7d0b1b6707cc
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 222d450..ca9f2f4 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -36,7 +36,7 @@
set req.http.MobileHost = req.http.Host;
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(www\.)?(mediawiki|wikimediafoundation|wikisource|wikidata)\.", "m.\2.");
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(commons|incubator|legalteam|meta|office|outreach|pl|species|strategy|wikimania201[2-5])\.(wikimedia)\.",
 "\1.m.\2.");
-   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
+   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m\b)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
 
if (req.http.Host != req.http.MobileHost) {
if (req.http.X-Forwarded-Proto) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I935b164b0a0d387f9538d6cc7b7d7d0b1b6707cc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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