Faidon Liambotis has submitted this change and it was merged. Change subject: Enable mobile redirect for wikimania2014.wikimedia.org ......................................................................
Enable mobile redirect for wikimania2014.wikimedia.org Change-Id: Iab4535eff1bb6469bc440d2ab215ad9584e1f6e9 --- M templates/squid/redirector.conf.erb M templates/varnish/text-frontend.inc.vcl.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/templates/squid/redirector.conf.erb b/templates/squid/redirector.conf.erb index 87999be..a0d98ab 100644 --- a/templates/squid/redirector.conf.erb +++ b/templates/squid/redirector.conf.erb @@ -4,7 +4,7 @@ # redirector configuration file # URL parsing regex -pattern=^http://(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania2012|wikimania2013)\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.<%= Regexp.escape(squid_redirector_tld) %>[:\d]*/wiki/(.*) +pattern=^http://(?: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)\.<%= Regexp.escape(squid_redirector_tld) %>[:\d]*/wiki/(.*) # What to replace the matching URLs with replacement=302:http://%sm.%s.<%= squid_redirector_tld %>/wiki/%s diff --git a/templates/varnish/text-frontend.inc.vcl.erb b/templates/varnish/text-frontend.inc.vcl.erb index 95f742a..c493288 100644 --- a/templates/varnish/text-frontend.inc.vcl.erb +++ b/templates/varnish/text-frontend.inc.vcl.erb @@ -9,7 +9,7 @@ && req.http.User-Agent !~ "(iPad|Android.3|(?i)tablet|(?i)(?!google)bot|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|wikimania2012|wikimania2013)\.(?=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)|\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/92671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab4535eff1bb6469bc440d2ab215ad9584e1f6e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MaxSem <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Mark Bergsma <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
