BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394902 )
Change subject: varnish: Don't redirect www.$project.org on mobile
......................................................................
varnish: Don't redirect www.$project.org on mobile
Currently varnish redirects www.$project.org to www.m.$project.org when
a mobile browser is detected. www.m.$project.org does exist in neither
DNS nor apache though, so we shouldn't redirect there.
This patch just kills the redirect from www.$project.org - that is,
varnish won't generate a local redirect for those domains anymore. It
will instead hand over the requests to apache, which already has
properly configured VirtualHosts for these and is going to
either serve the wwwportal or redirect elsewhere, based on the path
given in the request.
Bug: T154026
Change-Id: I6d849fc8f59957883c050634d0a396d3843b6d57
---
M modules/varnish/templates/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/modules/varnish/templates/text-frontend.inc.vcl.erb
b/modules/varnish/templates/text-frontend.inc.vcl.erb
index ea45b7c..a63240f 100644
--- a/modules/varnish/templates/text-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/text-frontend.inc.vcl.erb
@@ -34,7 +34,7 @@
set req.http.MobileHost = req.http.Host;
set req.http.MobileHost = regsub(req.http.MobileHost,
"^(www\.)?(mediawiki|wikisource|wikidata)\.", "m.\2.");
set req.http.MobileHost = regsub(req.http.MobileHost,
"^(commons|incubator|legalteam|meta|office|outreach|pl|species|strategy|wikimania20[0-9][0-9])\.wikimedia\.",
"\1.m.wikimedia.");
- 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.");
+ set req.http.MobileHost = regsub(req.http.MobileHost,
"^((?!www|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) {
set req.http.Location = "https://"; +
req.http.MobileHost + req.url;
--
To view, visit https://gerrit.wikimedia.org/r/394902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d849fc8f59957883c050634d0a396d3843b6d57
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EddieGP <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
