diff options
| author | mh <mh@immerda.ch> | 2008-04-25 10:43:41 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-04-25 10:43:41 +0000 |
| commit | 214e5d1a774dfa2e1c4745677f0cfce928c6167d (patch) | |
| tree | af3bbe41778a07941951078b33baf5050b8a7e2f /manifests/client.pp | |
| parent | c2fc3aa408e66fe0848fef1a40d5d4f57364f331 (diff) | |
another try to fix this problem
Diffstat (limited to 'manifests/client.pp')
| -rw-r--r-- | manifests/client.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 08fc3ba..2208b8d 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -59,7 +59,7 @@ class munin::client::base { ensure => directory, mode => 0755, owner => root, group => 0; "/etc/munin/munin-node.conf": - content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), + content => template("munin/munin-node.conf.$operatingsystem"), mode => 0644, owner => root, group => 0, # this has to be installed before the package, so the postinst can # boot the munin-node without failure! @@ -99,6 +99,9 @@ class munin::client::debian inherits munin::client::base { # sarge's munin-node init script has no status hasstatus => $lsbdistcodename ? { sarge => false, default => true } } + File["/etc/munin/munin-node.conf"]{ + content => template("munin/munin-node.conf.$operatingsystem"), + } # workaround bug in munin_node_configure plugin { "postfix_mailvolume": ensure => absent } include munin::plugins::debian @@ -111,9 +114,7 @@ class munin::client::gentoo inherits munin::client::base { name => 'munin', category => 'net-analyzer', } - File["/etc/munin/munin-node.conf"]{ - content => template("munin/munin-node.conf.$operatingsystem"), - } + include munin::plugins::gentoo } |