Faidon Liambotis has submitted this change and it was merged.
Change subject: Fix mobile redirect breakage
......................................................................
Fix mobile redirect breakage
Commit Iebfbc46 broke the mobile redirect for mediawiki.org,
wikimediafoundation.org and wikimedia.org subdomains. Fortunately it was
caught very shortly after its deployment and affects a very minor amount
of traffic. Fix this by fixing the regsubs().
Change-Id: I977c3bd04a0b5573efb88774fa6090e5e6f106f8
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index f857ac3..602e53f 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -30,9 +30,10 @@
# Separate regexps for clarity, but multiple regsubs instead of
# "if host ~"/regsub matches for efficiency. Be careful to not
# write overlapping/chaining regexps.
- set req.http.MobileHost = regsub(req.http.Host,
"^(www\.)?(mediawiki|wikimediafoundation)\.", "m.\2.");
- set req.http.MobileHost = regsub(req.http.Host,
"^(commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(wikimedia)\.",
"\1.m.\2.");
- set req.http.MobileHost = regsub(req.http.Host,
"^((?!www)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
"\1.m.\2.");
+ set req.http.MobileHost = req.http.Host;
+ set req.http.MobileHost = regsub(req.http.MobileHost,
"^(www\.)?(mediawiki|wikimediafoundation)\.", "m.\2.");
+ set req.http.MobileHost = regsub(req.http.MobileHost,
"^(commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(wikimedia)\.",
"\1.m.\2.");
+ set req.http.MobileHost = regsub(req.http.MobileHost,
"^((?!www)\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/107349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I977c3bd04a0b5573efb88774fa6090e5e6f106f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
