X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=05c6e196f817844b11badb67dc011f5e5b02aa8c;hb=b5fd299353f79a4cbfcdd0eaa0d740e17e1da1ae;hp=6e2eb5e1271b0198df0eb7737abfa72d11c52eea;hpb=a74d2b5351e782da2dea66815a2973d1cb1ed83b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 6e2eb5e12..05c6e196f 100644
--- 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,6 +46,12 @@ class munin-node {
         "vmstat":;
     }
 
+    case $spamd {
+        "true": {
+              activate_munin_check { "spamassassin":; }
+        }
+    }
+
     file {
         "/etc/munin/munin-node.conf":
             source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
@@ -53,8 +60,7 @@ class munin-node {
             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"];
     }