summaryrefslogtreecommitdiff
path: root/manifests/plugin
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-04-06 10:44:58 +0200
committermh <mh@immerda.ch>2011-04-06 10:44:58 +0200
commit23e3ddf1daa52d46c40d540d25218195997e8524 (patch)
tree78d7ae8592b4154ecd701228fe6f128d0b507695 /manifests/plugin
parentf2df62c9d17d481a3d616a4f2de9496638fadc0a (diff)
try to fix nagios::plugin problem
We have a serious problem with the concept that we had up to now if you start adding more than one nagios server. This is an attempt to fix it, with certain drawbacks, such as that you have to list all the nagios plugins in the nagios modules. This will be subject of further discussion.
Diffstat (limited to 'manifests/plugin')
-rw-r--r--manifests/plugin/deploy.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 75f87d7..96fea41 100644
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -10,14 +10,14 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $
}
if !defined(Package[$require_package]) {
- @@package { $require_package:
+ package { $require_package:
ensure => installed,
tag => "nagios::plugin::deploy::package";
}
}
include nagios::plugin::scriptpaths
- @@file { "nagios_plugin_${name}":
+ file { "nagios_plugin_${name}":
path => "$nagios::plugin::scriptpaths::script_path/${name}",
source => "puppet://$server/modules/$real_source",
mode => 0755, owner => root, group => 0,
@@ -26,5 +26,5 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $
}
# register the plugin
- @@nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] }
+ nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] }
}