summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-05-09 15:13:54 +0000
committermh <mh@immerda.ch>2008-05-09 15:13:54 +0000
commit84603253b9bba14df583f04f6b72620ccbee75f3 (patch)
tree5b7eeb2afffd90f821470094b20e4ad22683692d /manifests/init.pp
parent61f1aeb806d43c7812c7736d7f7bf74465acc8de (diff)
merged with puzzle's one
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index d47cc80..66355f6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -103,6 +103,7 @@ class nagios::base {
}
nagios::command{
+ nagios_command{
ssh_port:
command_line => '$USER1$/check_ssh -p $ARG1$ $HOSTADDRESS$';
# from apache2.pp
@@ -142,6 +143,7 @@ class nagios::centos inherits nagios::base {
Service[nagios]{
hasstatus => true,
}
+
# default cmd file from rpm
# don't forget it to add to the puppet paths
file { nagios_commands_cfg:
@@ -264,16 +266,14 @@ define nagios::service(
$nagios_contact_groups_in = $nagios_contact_groups,
$service_description = ''){
-
- # this is required to pass nagios' internal checks:
- # every service needs to have a defined host
+ # this ensures nagios internal check, that every
+ # service has it's host
include nagios::target::host
$real_nagios_contact_groups = $nagios_contact_groups_in ? {
'' => 'admins',
default => $nagios_contact_groups_in
}
-
@@nagios_service {$name:
check_command => $check_command,
use => $use,