X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=29bef07fef85f8b3fae7be4f6dcf80cc72a70ca4;hb=bdf6bb287648446a1b307811db95777989d80b7b;hp=034e821df0a1c5ce4b38e1b8d33736711ea2f1f6;hpb=c01cdbd4c5c3500f6a3427d6649d9755f79c574f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 034e821df..29bef07fe 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,8 +1,13 @@
-define activate_munin_check($ensure=present, script=$name) {
+define activate_munin_check($ensure=present, $script=$name) {
+    case $script {
+        "": { $base = $name }
+        default: { $base = $script }
+    }
+
     case $ensure {
         present: {
             file { "/etc/munin/plugins/$name":
-                     ensure => "/usr/share/munin/plugins/$script",
+                     ensure => "/usr/share/munin/plugins/$base",
                      notify => Exec["munin-node restart"];
             }
         }
@@ -32,18 +37,38 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
         "swap":;
+        "uptime":;
         "vmstat":;
     }
 
-    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"],
+    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"];
+
+        "/etc/munin/plugin-conf.d/munin-node":
+            content => template("munin-node/munin-node.plugin.conf.erb"),
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"];
     }
 
     exec { "munin-node restart":