From 75f0f1dbaa0827f64fb0d21db8f4a89296f177e0 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 8 Apr 2017 14:07:07 +0200 Subject: migrate to dedicated params --- manifests/rules/munin.pp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'manifests/rules/munin.pp') diff --git a/manifests/rules/munin.pp b/manifests/rules/munin.pp index a20a4e0..252f2ed 100644 --- a/manifests/rules/munin.pp +++ b/manifests/rules/munin.pp @@ -1,16 +1,19 @@ +# outgoing munin rules class shorewall::rules::munin( - $munin_port = '4949', - $munin_collector = ['127.0.0.1'], + $munin_port = '4949', + $munin_collector = ['127.0.0.1'], $collector_source = 'net' ){ - shorewall::params { 'MUNINPORT': value => $munin_port } - shorewall::params { 'MUNINCOLLECTOR': value => join(any2array($munin_collector),',') } - shorewall::rule{'net-me-munin-tcp': - source => "${collector_source}:\$MUNINCOLLECTOR", - destination => '$FW', - proto => 'tcp', - destinationport => '$MUNINPORT', - order => 240, - action => 'ACCEPT'; - } + shorewall::params4{ + 'MUNINPORT': value => $munin_port; + 'MUNINCOLLECTOR': value => join(any2array($munin_collector),','); + } + shorewall::rule{'net-me-munin-tcp': + source => "${collector_source}:\$MUNINCOLLECTOR", + destination => '$FW', + proto => 'tcp', + destinationport => '$MUNINPORT', + order => 240, + action => 'ACCEPT'; + } } -- cgit v1.2.3 From c2bf7e71d8598dbb05b5dee9f452b6332e9e916e Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 25 Apr 2017 15:28:26 +0200 Subject: make it possibble to disable ipv6 for these rules --- manifests/rules/munin.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/rules/munin.pp') diff --git a/manifests/rules/munin.pp b/manifests/rules/munin.pp index 252f2ed..9496138 100644 --- a/manifests/rules/munin.pp +++ b/manifests/rules/munin.pp @@ -2,7 +2,8 @@ class shorewall::rules::munin( $munin_port = '4949', $munin_collector = ['127.0.0.1'], - $collector_source = 'net' + $collector_source = 'net', + $shorewall6 = true, ){ shorewall::params4{ 'MUNINPORT': value => $munin_port; @@ -14,6 +15,7 @@ class shorewall::rules::munin( proto => 'tcp', destinationport => '$MUNINPORT', order => 240, + shorewall6 => $shorewall6, action => 'ACCEPT'; } } -- cgit v1.2.3