X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=be39fee4d1b7b5df76ec585bddf408d503185146;hb=293ece5a857f4ef3cd3de0105228235ffa43a45e;hp=7f464ba7b69290954a78ca64686dd6773063fe14;hpb=132ab39b9bfd5283d0452c6972f5af235bdc92bf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 7f464ba7b..be39fee4d 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,18 +1,52 @@
+define activate_munin_check($ensure=present) {
+    case $ensure {
+        present: {
+            file { "/etc/munin/plugins/$name":
+                     ensure => "/usr/share/munin/plugins/$name",
+                     notify => Exec["munin-node restart"];
+            }
+        }
+        default: {
+            file { "/etc/munin/plugins/$name":
+                     ensure => $ensure,
+                     notify => Exec["munin-node restart"];
+            }
+        }
+    }
+}
+
 class munin-node {
 
-    package { munin-node: ensure => latest }
+    package { munin-node: ensure => installed }
+
+    activate_munin_check {
+        "cpu":;
+        "df":;
+        "df_inode":;
+        "entropy":;
+        "forks":;
+        "interrupts":;
+        "iostat":;
+        "irqstats":;
+        "load":;
+        "memory":;
+        "ntp_offset":;
+        "open_files":;
+        "open_inodes":;
+        "processes":;
+        "swap":;
+        "vmstat":;
+    }
 
     file { "/etc/munin/munin-node.conf":
-        owner   => root,
-        group   => root,
-        mode    => 664,
-        source  => "puppet:///munin-node/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"],
     }
 
     exec { "munin-node restart":
-        path        => "/etc/init.d/",
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
 }