summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-06-29 06:42:01 +0200
committermh <mh@immerda.ch>2010-06-29 06:42:01 +0200
commit5761d798995156ab89f3e6dad01daa9ba1fb66ff (patch)
tree99077e0620cf4f4383219afe23ffba2700baa367
parent99b97c407f448e2a1d0d5f4cabda4b78f05d4753 (diff)
workaround puppet bug
-rw-r--r--manifests/base.pp2
-rw-r--r--manifests/plugin.pp3
2 files changed, 3 insertions, 2 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index e3c9c43..47ef9f3 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -81,7 +81,7 @@ class nagios::base {
Nagios_serviceescalation <<||>>
Nagios_serviceextinfo <<||>>
Nagios_timeperiod <<||>>
- Nagios::Plugin <<||>>
+ File <<| tag == 'nagios_plugin' |>>
Nagios_command <||> {
target => "${nagios_cfgdir}/conf.d/nagios_command.cfg",
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 85ef4b1..b001810 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -2,7 +2,7 @@ define nagios::plugin(
$source = 'absent',
$ensure = present
){
- file{$name:
+ @@file{$name:
path => $hardwaremodel ? {
'x86_64' => "/usr/lib64/nagios/plugins/$name",
default => "/usr/lib/nagios/plugins/$name",
@@ -12,6 +12,7 @@ define nagios::plugin(
'absent' => "puppet://$server/modules/nagios/plugins/$name",
default => "puppet://$server/modules/$source"
},
+ tag => 'nagios_plugin',
require => Package['nagios-plugins'],
owner => root, group => 0, mode => 0755;
}