Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99394
Change subject: varnish: remove .{wap,mobile} . rewrites/redirects
......................................................................
varnish: remove .{wap,mobile} . rewrites/redirects
These are now handled by Apache, via
I995fe573e7245ed03bff0109ee5d082cb1106d87, remove them from here.
This intentionally breaks URLs from the old Ruby gateway. Searches
across the web showed they are popular at all and the current rewrites
are already broken in most cases due to URL escaping of spaces.
Change-Id: I27afba1532bf0dd54e214d94ecd7fe136dfc3897
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/99394/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 882b647..5f590fe 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -40,18 +40,8 @@
} 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 */
@@ -70,10 +60,6 @@
*/
} else {
unset req.http.Cookie;
- }
-
- if (req.http.host == "mobile.wikipedia.org") {
- error 666 "http://en.mobile.wikipedia.org"; + req.url;
}
call device_detection;
--
To view, visit https://gerrit.wikimedia.org/r/99394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27afba1532bf0dd54e214d94ecd7fe136dfc3897
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
