X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=0fc6d1e41e00bacaf62c69658dcc0768882543bf;hb=ad5a9488437b6cd83adb83b5440dc8b3806ae80a;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..0fc6d1e41 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,18 +1,23 @@
+define activate_munin_check($name) {
+       file { "/etc/munin/plugins/$name":
+                ensure => "/usr/share/munin/plugins/$name",
+                notify => Exec["munin-node restart"];
+        }
+}
+
 class munin-node {
 
-    package { munin-node: ensure => latest }
+    package { munin-node: ensure => installed }
 
     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,
     }
 }