diff options
| author | mh <mh@immerda.ch> | 2014-09-13 05:16:18 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-09-13 05:16:18 +0200 |
| commit | ec4e2ba4f6f90116927ead35fca8c525a64a9e57 (patch) | |
| tree | ceb5f922aa89f92666c4086e71febab6a122b980 /manifests | |
| parent | 39eb7ac31ad7f1fc16c37c42823fb1860c1f09ba (diff) | |
| parent | ee32ce830d98b38f68293a648ca7dd83fde14422 (diff) | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client/gentoo.pp | 3 | ||||
| -rw-r--r-- | manifests/host.pp | 11 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/manifests/client/gentoo.pp b/manifests/client/gentoo.pp index fde592f..263fecd 100644 --- a/manifests/client/gentoo.pp +++ b/manifests/client/gentoo.pp @@ -2,8 +2,7 @@ class munin::client::gentoo inherits munin::client::base { Package['munin-node'] { - name => 'munin', - category => 'net-analyzer', + name => 'net-analyzer/munin', } include munin::plugins::gentoo diff --git a/manifests/host.pp b/manifests/host.pp index 55e28bf..0e5fb01 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -8,7 +8,6 @@ class munin::host( $export_tag = 'munin' ) { package {'munin': ensure => installed, } - include concat::setup Concat::Fragment <<| tag == $export_tag |>> @@ -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 |