Faidon has submitted this change and it was merged.
Change subject: Removed WMF detection as a ZERO carrier
......................................................................
Removed WMF detection as a ZERO carrier
* WMF IP ranges will no longer be detected as zero partner, making testing much
easier.
* Cleaned up obsolete comments
Change-Id: I990f8cbc5dc7b944b4324d3cd398e058bc255afd
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 28 deletions(-)
Approvals:
Faidon: 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 b21dbfe..7e94801 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -9,10 +9,6 @@
include "device-detection.inc.vcl";
-acl wmf_office {
- "216.38.130.160"/28;
-}
-
acl carrier_dtac {
"1.46.0.0"/15;
"103.1.164.0"/22;
@@ -107,11 +103,6 @@
"219.64.175.215";
"219.64.175.216"/31;
"219.64.175.219";
-}
-
-acl carrier_testing {
- "208.80.152.165";
- "208.80.153.194";
}
acl carrier_digi {
@@ -432,26 +423,8 @@
set req.http.X-CS = "510-11";
}
}
+ }
/* Please keep the above list alphabetized by the ACL variable */
- /* Testing ranges */
- } else if (client.ip ~ carrier_testing) {
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "wikimedia";
- set req.http.X-CS = "WMF";
- }
- } else if (client.ip ~ wmf_office) {
- if (req.http.X-Subdomain == "ZERO") {
- set req.http.X-Carrier = "wikimedia";
- set req.http.X-CS = "WMF";
- }
- }
-
- /* once actually in prod, ensure users can't make requests
- with a fake X-Carrier header */
- /* else {
- unset req.http.X-Carrier;
- }
- */
}
sub vcl_recv {
--
To view, visit https://gerrit.wikimedia.org/r/65156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I990f8cbc5dc7b944b4324d3cd398e058bc255afd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Dfoy <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Faidon <[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
