diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 1 | ||||
| -rw-r--r-- | manifests/plugin.pp | 23 |
2 files changed, 21 insertions, 3 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 8305bf0..bee3609 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -51,6 +51,7 @@ class munin::client::base { package { "munin-node": ensure => installed } service { "munin-node": ensure => running, + enable => true, hasstatus => true, hasrestart => true, require => Package[munin-node], diff --git a/manifests/plugin.pp b/manifests/plugin.pp index d24b580..af2c9e0 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -50,6 +50,12 @@ define munin::plugin ( require => Package['munin-node'], notify => Service['munin-node']; } + + if $require { + File[$plugin]{ + require +> $require, + } + } } } case $config { @@ -69,6 +75,11 @@ define munin::plugin ( content => "[${name}]\n$config\n", mode => 0644, owner => root, group => 0, } + if $require { + File[$plugin_conf]{ + require +> $require, + } + } } } } @@ -107,11 +118,17 @@ define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') { file { "munin_plugin_${name}": path => "$munin::plugin::scriptpaths::script_path/${name}", source => "puppet://$server/$real_source", - ensure => file, + require => Package['munin-node'], mode => 0755, owner => root, group => 0; } - - munin::plugin{$name: ensure => $ensure, config => $config } + if $require { + File["munin_plugin_${name}"]{ + require +> $require, + } + munin::plugin{$name: ensure => $ensure, config => $config, require => $require } + } else { + munin::plugin{$name: ensure => $ensure, config => $config } + } } ### clases for plugins |