diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 37 | ||||
| -rw-r--r-- | manifests/plugins/setup.pp | 4 |
2 files changed, 8 insertions, 33 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index b7cd5d4..2d4c82b 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -12,39 +12,14 @@ class munin::client( $shorewall_collector_source = 'net', $export_tag = 'munin' ) { - anchor { 'munin::client::installed': } case $::operatingsystem { - openbsd: { - class { 'munin::client::openbsd': - before => Anchor['munin::client::installed'] - } - } - darwin: { - class { 'munin::client::darwin': - before => Anchor['munin::client::installed'] - } - } - debian,ubuntu: { - class { 'munin::client::debian': - before => Anchor['munin::client::installed'] - } - } - gentoo: { - class { 'munin::client::gentoo': - before => Anchor['munin::client::installed'] - } - } - centos: { - class { 'munin::client::base': - before => Anchor['munin::client::installed'] - } - } - default: { - class { 'munin::client::base': - before => Anchor['munin::client::installed'] - } - } + openbsd: { include munin::client::openbsd } + darwin: { include munin::client::darwin } + debian,ubuntu: { include munin::client::debian } + gentoo: { include munin::client::gentoo } + centos: { include munin::client::base } + default: { include munin::client::base } } if $munin::client::manage_shorewall { class{'shorewall::rules::munin': diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index e1a57d9..23222ec 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -4,7 +4,7 @@ class munin::plugins::setup { file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: ensure => directory, - require => Anchor['munin::client::installed'], + require => Package['munin-node'], ignore => 'snmp_*', checksum => mtime, recurse => true, @@ -16,7 +16,7 @@ class munin::plugins::setup { mode => '0755'; '/etc/munin/plugin-conf.d/munin-node': ensure => present, - require => Anchor['munin::client::installed'], + require => Package['munin-node'], notify => Service['munin-node'], owner => root, group => 0, |