BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/385414 )
Change subject: htcppurger: vhtcpd-0.1.x specifics
......................................................................
htcppurger: vhtcpd-0.1.x specifics
Apply this after package upgrades on all the varnishes!
The -l argument no longer exists and is silently ignored, and the
"varnishes" are documented to have optional ",delay" parameters.
Change-Id: Ia03a87f25cfea5ac1dcebbd3a1915bde49a6cf75
---
M modules/varnish/manifests/htcppurger.pp
M modules/varnish/templates/vhtcpd-default.erb
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/385414/1
diff --git a/modules/varnish/manifests/htcppurger.pp
b/modules/varnish/manifests/htcppurger.pp
index 62ae187..ea664ca 100644
--- a/modules/varnish/manifests/htcppurger.pp
+++ b/modules/varnish/manifests/htcppurger.pp
@@ -8,9 +8,10 @@
# Required - Array of multicast addresses to subscribe.
#
# [*varnishes*]
-# Array of 'IP:Port' for local varnish instances to forward to, defaults to
-# ports 3127 and 3128 on localhost (our standard 2-layer frontend + backend
-# instances).
+# Required - Array of 'IP:Port[,delay]' for local varnish instances to
forward to.
+#
+# [*host_regex*]
+# Required - Regex filter for hosts to PURGE, empty string '' for no
filtering
#
# === Multicast assignments:
# 239.128.0.112 - text (legacy: all HTCP used this address)
diff --git a/modules/varnish/templates/vhtcpd-default.erb
b/modules/varnish/templates/vhtcpd-default.erb
index 6b16ae7..dd80216 100644
--- a/modules/varnish/templates/vhtcpd-default.erb
+++ b/modules/varnish/templates/vhtcpd-default.erb
@@ -1 +1 @@
-DAEMON_OPTS="-m <%= @mc_addrs.join(' -m ') -%> -c <%= @varnishes.join(' -c ')
-%><%= @regex_arg -%> -l 1024"
+DAEMON_OPTS="-m <%= @mc_addrs.join(' -m ') -%> -c <%= @varnishes.join(' -c ')
-%><%= @regex_arg -%>"
--
To view, visit https://gerrit.wikimedia.org/r/385414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia03a87f25cfea5ac1dcebbd3a1915bde49a6cf75
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
