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 8ba1fbe58e69142bd85d5213647cb57ffe53d12b..06d47cedf8a9d8e79d91ac6bd59f9a1fbc95e07a 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -60,8 +60,7 @@ class munin-node {
 
     file {
         "/etc/munin/munin-node.conf":
-            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
-                         "puppet:///munin-node/common/munin-node.conf" ],
+            content => template("munin-node/munin-node.conf.erb"),
             require => Package["munin-node"],
             notify  => Exec["munin-node restart"];
 
@@ -75,5 +74,14 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    @ferm::rule { "dsa-munin-v4":
+            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; }"
+    }
 }