Add default File template and remove lots of boilerplate

[mirror/dsa-puppet.git] / modules / munin-node / manifests / init.pp

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 7f464ba..4048150 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -3,16 +3,14 @@ class munin-node {
     package { munin-node: ensure => latest }
 
     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,
     }
 }