Merge remote-tracking branch 'immerda/master' into immerda_merge

1 files changed, 18 insertions, 13 deletions

diff --git a/manifests/rules/munin.pp b/manifests/rules/munin.pp
index a20a4e0..9496138 100644
--- a/manifests/rules/munin.pp
+++ b/manifests/rules/munin.pp
@@ -1,16 +1,21 @@
+# outgoing munin rules
 class shorewall::rules::munin(
-  $munin_port = '4949',
-  $munin_collector = ['127.0.0.1'],
-  $collector_source = 'net'
+  $munin_port       = '4949',
+  $munin_collector  = ['127.0.0.1'],
+  $collector_source = 'net',
+  $shorewall6       = true,
 ){
-    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,
+    shorewall6      => $shorewall6,
+    action          => 'ACCEPT';
+  }
 }