diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client/debian.pp | 9 | ||||
| -rw-r--r-- | manifests/host.pp | 15 | ||||
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/plugin.pp | 2 | ||||
| -rw-r--r-- | manifests/plugin/deploy.pp | 2 |
5 files changed, 10 insertions, 20 deletions
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index f1bbb3c..49ee567 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -3,15 +3,6 @@ class munin::client::debian inherits munin::client::base { # the plugin will need that ensure_packages(['iproute']) - $hasstatus = $::lsbdistcodename ? { - sarge => false, - default => true - } - - Service['munin-node']{ - # sarge's munin-node init script has no status - hasstatus => $hasstatus - } # workaround bug in munin_node_configure plugin { 'postfix_mailvolume': ensure => absent } include munin::plugins::debian diff --git a/manifests/host.pp b/manifests/host.pp index e666c3d..0e5fb01 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -8,17 +8,16 @@ class munin::host( $export_tag = 'munin' ) { package {'munin': ensure => installed, } - include concat::setup Concat::Fragment <<| tag == $export_tag |>> concat::fragment{'munin.conf.header': target => '/etc/munin/munin.conf', source => [ "puppet:///modules/site_munin/config/host/${::fqdn}/munin.conf.header", - "puppet:///modules/site_munin/config/host/munin.conf.header.${::operatingsystem}.${::lsbdistcodename}", + "puppet:///modules/site_munin/config/host/munin.conf.header.${::operatingsystem}.${::operatingsystemmajrelease}", "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}.${::lsbdistcodename}", + "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}.${::operatingsystemmajrelease}", "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}", 'puppet:///modules/munin/config/host/munin.conf.header' ], order => 05, @@ -39,12 +38,12 @@ class munin::host( } # 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', + cron { 'munin_kill': + command => 'if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi', + minute => ['4', '34'], + user => 'root', } + if $munin::host::manage_shorewall { include shorewall::rules::out::munin } diff --git a/manifests/init.pp b/manifests/init.pp index b015521..54b489b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # # Copyright 2008, Puzzle ITC GmbH -# Marcel Härry haerry+puppet(at)puzzle.ch +# Marcel Haerry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # # This program is free software; you can redistribute diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 37d0077..50b861b 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -27,7 +27,7 @@ define munin::plugin ( target =>"${real_script_path}/${plugin_src}", notify => Service['munin-node']; } - if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::lsbmajdistrelease != '5')){ + if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::operatingsystemmajrelease != '5')){ File["/etc/munin/plugins/${name}"]{ seltype => 'munin_etc_t', } diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 461a218..2ffd92e 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -24,7 +24,7 @@ define munin::plugin::deploy( mode => '0755'; } - if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::lsbmajdistrelease > '5')){ + if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > '5')){ File["munin_plugin_${name}"]{ seltype => $seltype, } |