summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-06-28 22:34:30 +0200
committermh <mh@immerda.ch>2010-06-28 22:34:30 +0200
commit99b97c407f448e2a1d0d5f4cabda4b78f05d4753 (patch)
tree102000d43b03be1e0f89ed701731fcbc685ba6bf /manifests
parent5a138b57821288d02e58a5f59bd45ce918ab797a (diff)
adjust plugin stuff, so we can remotely specify new plugins
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp1
-rw-r--r--manifests/plugin.pp6
2 files changed, 6 insertions, 1 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index fa9f98a..e3c9c43 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -81,6 +81,7 @@ class nagios::base {
Nagios_serviceescalation <<||>>
Nagios_serviceextinfo <<||>>
Nagios_timeperiod <<||>>
+ Nagios::Plugin <<||>>
Nagios_command <||> {
target => "${nagios_cfgdir}/conf.d/nagios_command.cfg",
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 4789345..85ef4b1 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -1,4 +1,5 @@
define nagios::plugin(
+ $source = 'absent',
$ensure = present
){
file{$name:
@@ -7,7 +8,10 @@ define nagios::plugin(
default => "/usr/lib/nagios/plugins/$name",
},
ensure => $ensure,
- source => "puppet://$server/modules/nagios/plugins/$name",
+ source => $source ? {
+ 'absent' => "puppet://$server/modules/nagios/plugins/$name",
+ default => "puppet://$server/modules/$source"
+ },
require => Package['nagios-plugins'],
owner => root, group => 0, mode => 0755;
}