Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/293887
Change subject: Stop restricting carrier tagging to mobile subdomains
......................................................................
Stop restricting carrier tagging to mobile subdomains
It's no longer the case that the mobile platforms exclusively use the
mobile subdomains. The Android app has been using non-mobile domains
since January to avoid cache fragmentation, and the iOS app will soon
as well due to an unrelated issue. Removing the limit on carrier
tagging to mobile subdomains would remove the need for the apps to
support mobile domains for the sole purpose of retrieving a carrier's
Zero configuration.
Continuing to limit it to the Wikipedias is fine since only the Wikipedias
are zero-rated.
Change-Id: I488dfaf2ea7cd61eb6ddfccc6b2cd7b8caf0a82d
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/293887/1
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 6cd88f0..3ab8a28 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -81,13 +81,13 @@
set req.http.X-Subdomain = "M";
}
- // mobile-subdomains-only for tag-carrier and Host-rewrite
- if (req.http.X-Subdomain) {
- // Only do tag_carrier logic on first start, and only
for (m|zero).wp
- if (req.http.host ~
"^([a-z0-9-]+\.)?(m|zero)\.wikipedia\.") {
- call tag_carrier;
- }
+ // Only do tag_carrier logic for Wikipedia requests
+ if (req.http.host ~ "^([a-z0-9-]+\.)?wikipedia\.") {
+ call tag_carrier;
+ }
+ // mobile subdomains only for Host-rewrite
+ if (req.http.X-Subdomain) {
// Rewrite mobile hostnames to desktop hostnames as
x-dt-host
if (req.http.host == "m.mediawiki.org") {
set req.http.x-dt-host = "www.mediawiki.org";
--
To view, visit https://gerrit.wikimedia.org/r/293887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I488dfaf2ea7cd61eb6ddfccc6b2cd7b8caf0a82d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
