BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265852
Change subject: Restbase mobile-via-text fixup 2/2
......................................................................
Restbase mobile-via-text fixup 2/2
Re-use the x-dt-host header set in the frontends from 1/2 when
doing the mobile hostname backend mangle, to reduce duplication.
Previous change must be rolled out fully to all frontends before
applying this to any backends!
Change-Id: I43a581341f2dc400c64e4665d4f887cd679a706c
---
M templates/varnish/text-backend.inc.vcl.erb
1 file changed, 1 insertion(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/265852/1
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 5abc309..7c8740c 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -50,19 +50,7 @@
<% if @site_tier == "one" && scope.function_hiera(["cluster"]) == "cache_text"
-%>
sub mobile_hostname_1be_mangle {
if (req.http.X-Subdomain) {
- // Rewrite m.mediawiki.org to mediawiki.org etc
- if (req.http.host == "m.mediawiki.org") {
- set bereq.http.host = "www.mediawiki.org";
- } else if (req.http.host == "m.wikimediafoundation.org") {
- set bereq.http.host = "wikimediafoundation.org";
- } else if (req.http.host == "m.wikisource.org") {
- set bereq.http.host = "wikisource.org";
- } else if (req.http.host == "m.wikidata.org") {
- set bereq.http.host = "www.wikidata.org";
- } else {
- // Replace <language>.(m|zero).<project>.org by
<language>.<project>.org
- set bereq.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
- }
+ set bereq.http.host = req.http.x-dt-host;
}
}
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/265852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a581341f2dc400c64e4665d4f887cd679a706c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
