diff options
Diffstat (limited to 'manifests/host.pp')
| -rw-r--r-- | manifests/host.pp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index b9e59e4..cf445ce 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -7,22 +7,18 @@ class munin::host inherits munin if $munin_ensure_version == '' { $munin_ensure_version = 'installed' } - File <<| tag == 'munin' |>> - package {"munin": ensure => $munin_ensure_version, } - + File <<| tag == 'munin' |>> file{'/etc/munin/munin.conf.header': - source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/munin.conf.header", - "puppet://$server/modules/site-munin/config/host/munin.conf.header.$operatingsystem", - "puppet://$server/modules/site-munin/config/host/munin.conf.header", - "puppet://$server/modules/munin/config/host/munin.conf.header.$operatingsystem", - "puppet://$server/modules/munin/config/host/munin.conf.header" ], + source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header", + "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem", + "puppet:///modules/site-munin/config/host/munin.conf.header", + "puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem", + "puppet:///modules/munin/config/host/munin.conf.header" ], notify => Exec['concat_/etc/munin/munin.conf'], - owner => root, group => 0, mode => 0644; - } - + concatenated_file { "/etc/munin/munin.conf": dir => '/var/lib/puppet/modules/munin/nodes', header => "/etc/munin/munin.conf.header", @@ -37,15 +33,15 @@ class munin::host inherits munin include munin::plugins::muninhost case $operatingsystem { - centos: { - include munin::host::cgi - # from time to time we cleanup hanging munin-runs - file{'/etc/cron.d/munin_kill': - content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n", - owner => root, group => 0, mode => 0644; - } - } + centos: { include munin::host::cgi } } + + # from time to time we cleanup hanging munin-runs + file{'/etc/cron.d/munin_kill': + content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n", + owner => root, group => 0, mode => 0644; + } + if $use_shorewall { include shorewall::rules::out::munin } |