does that work?

[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 d70ffdc0f9600021d9de015937d241e5e94e5226..9b40cf965cf648320682e9a6cd0af85f377d3e74 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,4 +1,4 @@
-define activate_munin_check($ensure=present, script=$name) {
+define activate_munin_check($ensure=present, $script=$name) {
     case $script {
         "": { $base = $name }
         default: { $base = $script }
@@ -52,6 +52,12 @@ class munin-node {
         }
     }
 
+    case $vsftpd {
+        "true": {
+              include munin-node::vsftpd
+        }
+    }
+
     file {
         "/etc/munin/munin-node.conf":
             source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
@@ -69,5 +75,14 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    case $ferm {
+       "true": {
+           ferm::rule { "dsa-munin":
+               description     => "Allow munin-node from spohr.debian.org",
+               rule            => 'proto tcp dport 4949 saddr $HOST_MUNIN ACCEPT',
+               prio            => "02"
+          }
+       }
+   }
 }