diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2008-05-13 12:09:59 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2008-05-13 12:09:59 +0200 |
| commit | 673aa3cb3860aee50b80bda98156a3d6bf8e49d9 (patch) | |
| tree | 2123f795deab3e7c5b093ad646112a6e4b4883d6 /manifests | |
| parent | 876a2769f2c48979202ed03bbb7baeb0ebde14e1 (diff) | |
| parent | 0449faea92a65380646c5591ee0509fcdc67ab0b (diff) | |
Merge commit 'immerda/master' into development
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/plugin.pp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 6a92c56..d24b580 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -93,7 +93,11 @@ define munin::remoteplugin($ensure = "present", $source, $config = '') { } } define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') { - $plugin_src = $ensure ? { "present" => $name, default => $ensure } + $plugin_src = $ensure ? { + 'present' => $name, + 'absent' => $name, + default => $ensure + } $real_source = $source ? { '' => "munin/plugins/$plugin_src", default => $source @@ -241,10 +245,17 @@ class munin::plugins::selinux inherits munin::plugins::base { munin::plugin::deploy { "selinux_avcstats": } } +class munin::plugins::squid inherits munin::plugins::base { + munin::plugin{ 'squid_cache': config => "user root\nenv.squidhost localhost\nenv.squidport 80"} + munin::plugin{ 'squid_icp': } + munin::plugin{ 'squid_requests': } + munin::plugin{ 'squid_traffic': } +} + class munin::plugins::postgres inherits munin::plugins::base { munin::plugin::deploy { "pg_conn": } - munin::plugin::deploy { "pg__connections": ensure => false } - munin::plugin::deploy { "pg__locks": ensure => false } + munin::plugin::deploy { "pg__connections": ensure => 'absent' } + munin::plugin::deploy { "pg__locks": ensure => 'absent' } } class munin::plugins::nagios inherits munin::plugins::base { munin::plugin::deploy { |