X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=d70ffdc0f9600021d9de015937d241e5e94e5226;hb=59895548c1eb3504b073e5bc648faa6d3f96b6e6;hp=947774334265f99606c18f3407f7b5a8693fd1dd;hpb=e921c57eed9647b16a3a23041bd872b1232cde16;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 947774334..d70ffdc0f 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -37,6 +37,7 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
@@ -45,18 +46,23 @@ 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",
                          "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":