Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert "varnish: remove .{wap,mobile}. rewrites/redirects"
......................................................................
Revert "varnish: remove .{wap,mobile}. rewrites/redirects"
*.mobile.wikipedia.org gets hits from Googlebot and Bingbot.
301s wouldn't hurt them but let's revert that for now until
we understand why is that the case.
This partially reverts commit 745a20764b6f130a6ffec676e1d7f9756ce87551.
Change-Id: I74bab7704b02e0c1a5c5f1f12ad1d250e6f8d92e
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 10 insertions(+), 0 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 5f590fe..260e9fa 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -40,8 +40,18 @@
} else if (req.http.host == "m.wikimediafoundation.org") {
set req.http.host = "wikimediafoundation.org";
} else {
+
/* Replace <language>.(m|zero).<project>.org by
<language>.<project>.org */
set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
+
+ /* Rewrite <language>.wap.wikipedia.org to new mobile site */
+ set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.wap\.", "\1.mobile.");
+
+ /* Support the old mobile.wikipedia.org wap gateway */
+ if (req.http.host ~
"^([a-zA-Z0-9-]+)\.mobile\.([a-zA-Z0-9-]+)\.org$") {
+ set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.mobile\.", "\1.");
+ set req.url = regsub(req.url, "\S+[\?&]go=([^&]+).*",
"/wiki/\1");
+ }
}
/* Allow purging */
--
To view, visit https://gerrit.wikimedia.org/r/99395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74bab7704b02e0c1a5c5f1f12ad1d250e6f8d92e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
