Revert "will ferm do the right thing?"

[dsa-puppet.git] / modules / munin-node / manifests / init.pp

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 06d47cedf8a9d8e79d91ac6bd59f9a1fbc95e07a..ac999ef90a0a5a666ca6558150a5c86cd33f36f0 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -74,14 +74,9 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
-    @ferm::rule { "dsa-munin-v4":
+    @ferm::rule { "dsa-munin":
             description     => "Allow munin from munin master",
-            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }"
-    }
-    @ferm::rule { "dsa-munin-v6":
-            description     => "Allow munin from munin master",
-            domain          => "ip6",
-            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }"
+            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
     }
 }