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 947774334265f99606c18f3407f7b5a8693fd1dd..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 }
@@ -37,6 +37,7 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
@@ -45,23 +46,43 @@ class munin-node {
         "vmstat":;
     }
 
+    case $spamd {
+        "true": {
+              activate_munin_check { "spamassassin":; }
+        }
+    }
+
+    case $vsftpd {
+        "true": {
+              include munin-node::vsftpd
+        }
+    }
+
     file {
         "/etc/munin/munin-node.conf":
             source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
                          "puppet:///munin-node/common/munin-node.conf" ],
             require => Package["munin-node"],
-            notify  => Exec["munin-node restart"],
+            notify  => Exec["munin-node restart"];
 
         "/etc/munin/plugin-conf.d/munin-node":
-            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.plugin.conf",
-                         "puppet:///munin-node/common/munin-node.plugin.conf" ],
+            content => template("munin-node/munin-node.plugin.conf.erb"),
             require => Package["munin-node"],
-            notify  => Exec["munin-node restart"],
+            notify  => Exec["munin-node restart"];
     }
 
     exec { "munin-node restart":
         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"
+          }
+       }
+   }
 }