Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
index 95e7393544c8027bb12111ae15cb254b0de68261..b5448b07a718827e7a004c2a89687054734678a9 100644 (file)
--- a/modules/ferm/files/ferm.conf
+++ b/modules/ferm/files/ferm.conf
@@ -7,14 +7,6 @@
 
 @include 'conf.d/';
 
-domain (ip ip6) {
-        table filter {
-              chain (INPUT OUTPUT) {
-                      NOP;
-              }
-        }
-}
-
 domain ip {
         table filter {
               chain log_and_reject {

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 84fc808d735283d09b5b004793c54243881a98cf..ff57e9140357cd588ef91b42ff917b5efe237ab5 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -48,6 +48,12 @@ class ferm {
                         notify  => Exec["ferm restart"];
         }
 
+        $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+
+        activate_munin_check {
+            $munin_ips: script => "ip_";
+        }
+
         exec { "ferm restart":
                 command     => "/etc/init.d/ferm restart",
                 refreshonly => true,