Mark Bergsma has submitted this change and it was merged.
Change subject: Simplify and cleanup the mobile host rewrites
......................................................................
Simplify and cleanup the mobile host rewrites
Change-Id: Iab9633b265fa0f7a7f05080ed46c217bedd75bd8
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 6 insertions(+), 8 deletions(-)
Approvals:
Mark Bergsma: 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 6e4ea10..7bc150a 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -574,19 +574,17 @@
set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
/* Rewrite <language>.wap.wikipedia.org to new mobile site */
- if ( req.http.host ~ "^([a-zA-Z0-9-]+)\.wap\.([a-zA-Z0-9-]+)\.org" ) {
- set req.http.host = regsub( req.http.host,
"^([a-zA-Z0-9-]+)\.wap\.([a-zA-Z0-9-]+)\.org", "\1.mobile.\2.org");
- }
+ set req.http.host = regsub(req.http.host, "^([a-zA-Z0-9-]+)\.wap\.",
"\1.mobile.");
/* Rewrite m.mediawiki.org to mediawiki.org etc */
- if ( req.http.host ~ "^m\.mediawiki\.org" ) {
- set req.http.host = regsub( req.http.host,
"^m\.mediawiki\.org", "www.mediawiki.org");
+ if (req.http.host == "m.mediawiki.org") {
+ set req.http.host = "www.mediawiki.org";
}
/* Support the old mobile.wikipedia.org wap gateway */
- else 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\.([a-zA-Z0-9-]+)\.org", "\1.\2.org" );
- set req.url = regsub( req.url, "\S+[\?&]go=([^&]+).*",
"/wiki/\1" );
+ 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");
}
/* FIXME: deploy X-Vary-Options support */
--
To view, visit https://gerrit.wikimedia.org/r/59401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab9633b265fa0f7a7f05080ed46c217bedd75bd8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Hashar <[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
