X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=0849cc1bd235e6ca98075e7e7dc63ca28444fc43;hb=8e9a688dd67c65c08c9c4f90bf0f5a7df15549a5;hp=91e1e78bc66da8d03f4391ed6e6d7b112c91b80a;hpb=13cc186d4a429102a752fb2a0ec26515f1fc17af;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 91e1e78bc..0849cc1bd 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,6 +1,6 @@
-define activate_munin_check($ensure=present, $script=$name) {
+define activate_munin_check($ensure=present, $script = none) {
     case $script {
-        "": { $link = $name }
+        none: { $link = $name }
         default: { $link = $script }
     }
 
@@ -75,5 +75,10 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    ferm::rule { "dsa-munin":
+            domain          => "(ip ip6)",
+            description     => "Allow munin from munin master",
+            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
+    }
 }