aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules/munin.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
commitdffe0d74eadc7c25ab9ee513cb3a6b345dfa7644 (patch)
tree53e848d9d576687ec2c032564b6c42ba21b678f1 /manifests/rules/munin.pp
parent589f5723d500ad7325e19dfeb1d3b8450044acf1 (diff)
parentedd5db0159d5075609c545fb3ee10727a1cf5271 (diff)
downloadpuppet-shorewall-dffe0d74eadc7c25ab9ee513cb3a6b345dfa7644.tar.gz
puppet-shorewall-dffe0d74eadc7c25ab9ee513cb3a6b345dfa7644.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmaster
Conflicts: manifests/tunnel.pp
Diffstat (limited to 'manifests/rules/munin.pp')
-rw-r--r--manifests/rules/munin.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/rules/munin.pp b/manifests/rules/munin.pp
index 0c86abe..a20a4e0 100644
--- a/manifests/rules/munin.pp
+++ b/manifests/rules/munin.pp
@@ -1,10 +1,10 @@
class shorewall::rules::munin(
$munin_port = '4949',
- $munin_collector = '127.0.0.1',
+ $munin_collector = ['127.0.0.1'],
$collector_source = 'net'
){
shorewall::params { 'MUNINPORT': value => $munin_port }
- shorewall::params { 'MUNINCOLLECTOR': value => join($munin_collector,',') }
+ shorewall::params { 'MUNINCOLLECTOR': value => join(any2array($munin_collector),',') }
shorewall::rule{'net-me-munin-tcp':
source => "${collector_source}:\$MUNINCOLLECTOR",
destination => '$FW',