diff options
author | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
---|---|---|
committer | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
commit | 447041b01494690975d078776a85f4a3fd4e64fa (patch) | |
tree | 0d09932e8466de8208144aa034de401398151ca6 /manifests/client/base.pp | |
parent | 553fbe3e1d3c6865172c1db8cf93d69fb936dc18 (diff) | |
parent | eb953716cd545f86972e85d983b5862c194f5aed (diff) |
merge with immerda/master
Diffstat (limited to 'manifests/client/base.pp')
-rw-r--r-- | manifests/client/base.pp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp index 1f72e7e..17387e8 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -1,11 +1,11 @@ class munin::client::base { service { 'munin-node': - ensure => running, + ensure => running, enable => true, hasstatus => true, hasrestart => true, } - file {'/etc/munin/': + file {'/etc/munin': ensure => directory, mode => 0755, owner => root, group => 0; } @@ -14,10 +14,12 @@ class munin::client::base { default => $munin_allow } file {'/etc/munin/munin-node.conf': - content => template("munin/munin-node.conf.$operatingsystem"), + content => template("munin/munin-node.conf.$operatingsystem"), notify => Service['munin-node'], - mode => 0644, owner => root, group => 0, - } - munin::register { $fqdn: } - include munin::plugins::base + mode => 0644, owner => root, group => 0, + } + munin::register { $fqdn: + config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'], + } + include munin::plugins::base } |