BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130780
Change subject: use carriers.json for zero data
......................................................................
use carriers.json for zero data
Change-Id: I608b7ebce7413b66363c52721f202cd6c0bda830
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/130780/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 446eb79..9b5f8dd 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -5,8 +5,7 @@
sub vcl_init {
// args here are map-name (for .map()), data file, and seconds between
mtime checks for reload
- // XXX rename "zero" to "carriers" to match upstream source, after
fetcher is updated everywhere
- netmapper.init("zero", "/var/netmapper/zero.json", 89);
+ netmapper.init("carriers", "/var/netmapper/carriers.json", 89);
netmapper.init("proxies", "/var/netmapper/proxies.json", 89);
}
@@ -56,12 +55,12 @@
unset req.http.XFF-NoSSL; // clean up temp var
/****************************************************************
- * v> | XFF-CE | map("zero") input from regsub below
+ * v> | XFF-CE | map("carriers") input from regsub below
* all | (...,)? client | client
*****************************************************************/
// Grab client IP from the end of the XFF-CE list and feed to
map("zero")
- set req.http.X-CS2 = netmapper.map("zero",
regsub(req.http.XFF-ClientEnd, "^([^,]+, ?)+", ""));
+ set req.http.X-CS2 = netmapper.map("carriers",
regsub(req.http.XFF-ClientEnd, "^([^,]+, ?)+", ""));
// normalize to boolean (varnish-3.0.4...)
if (req.http.X-CS2 == "") {
--
To view, visit https://gerrit.wikimedia.org/r/130780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I608b7ebce7413b66363c52721f202cd6c0bda830
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
