Faidon Liambotis has submitted this change and it was merged. Change subject: Varnish: don't mobile redirect www.$project.org ......................................................................
Varnish: don't mobile redirect www.$project.org URLs such as www.wikivoyage.org/wiki/Article redirect to en.wikivoyage.org. The issue is not Wikivoyage-specific projects as it happens with e.g. www.wikipedia.org too. However, www.wikivoyage.org links are still in old web references & search engine indexes, so it makes matters especially worse for Wikivoyage. The problem is the mobile redirector runs before these redirects take place, and redirects to www.m, which NXDOMAINs and users get error pages. Fix this by excluding "www" from the mobile redirect. Bug: 48318 Change-Id: Ie9147de410a51e3bd3d3597e27b00ccee4f9f236 --- M templates/varnish/text-frontend.inc.vcl.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: 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 cde37d0..c3474da 100644 --- a/templates/varnish/text-frontend.inc.vcl.erb +++ b/templates/varnish/text-frontend.inc.vcl.erb @@ -26,7 +26,7 @@ && req.http.User-Agent !~ "(iPad|Android.3|(?i)tablet|PlayBook|Wii)" && req.http.Cookie !~ "(stopMobileRedirect=true|mf_useformat=desktop)" && req.url ~ "^/wiki/") { - set req.http.MobileHost = regsub(req.http.Host, "^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.", "\1m.\2."); + set req.http.MobileHost = regsub(req.http.Host, "^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(?=wikimedia)|(?!www)\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.", "\1m.\2."); if (req.http.Host != req.http.MobileHost) { if (req.http.X-Forwarded-Proto) { set req.http.Location = req.http.X-Forwarded-Proto + "://" + req.http.MobileHost + req.url; -- To view, visit https://gerrit.wikimedia.org/r/89879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9147de410a51e3bd3d3597e27b00ccee4f9f236 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: JanZerebecki <jan.wikime...@zerebecki.de> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits