Faidon Liambotis has submitted this change and it was merged. Change subject: Enable mobile redirect for old Wikisource (http://wikisource.org) ......................................................................
Enable mobile redirect for old Wikisource (http://wikisource.org) Bug: 69765 Change-Id: I0e75d871af87313e2970a8a955d98efbc0551076 --- M templates/varnish/mobile-frontend.inc.vcl.erb M templates/varnish/text-frontend.inc.vcl.erb 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb b/templates/varnish/mobile-frontend.inc.vcl.erb index 9c58309..ee81201 100644 --- a/templates/varnish/mobile-frontend.inc.vcl.erb +++ b/templates/varnish/mobile-frontend.inc.vcl.erb @@ -50,7 +50,7 @@ } else { set req.http.X-Subdomain = "M"; } - + if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?(m|zero)\.wikipedia\.") { call tag_carrier; } @@ -61,6 +61,8 @@ set req.http.host = "www.mediawiki.org"; } else if (req.http.host == "m.wikimediafoundation.org") { set req.http.host = "wikimediafoundation.org"; + } else if (req.http.host == "m.wikisource.org") { + set req.http.host = "wikisource.org"; } else { /* Replace <language>.(m|zero).<project>.org by <language>.<project>.org */ @@ -201,4 +203,3 @@ } <% end -%> } - diff --git a/templates/varnish/text-frontend.inc.vcl.erb b/templates/varnish/text-frontend.inc.vcl.erb index 5d65343..ff75690 100644 --- a/templates/varnish/text-frontend.inc.vcl.erb +++ b/templates/varnish/text-frontend.inc.vcl.erb @@ -63,9 +63,9 @@ # "if host ~"/regsub matches for efficiency. Be careful to not # write overlapping/chaining regexps. 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, "^(www\.)?(mediawiki|wikimediafoundation|wikisource)\.", "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)\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)\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/167032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e75d871af87313e2970a8a955d98efbc0551076 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
