From 84603253b9bba14df583f04f6b72620ccbee75f3 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 9 May 2008 15:13:54 +0000
Subject: merged with puzzle's one

---
 files/empty/.git_placeholder | 1 +
 manifests/init.pp            | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 files/empty/.git_placeholder

diff --git a/files/empty/.git_placeholder b/files/empty/.git_placeholder
new file mode 100644
index 0000000..89cb1fe
--- /dev/null
+++ b/files/empty/.git_placeholder
@@ -0,0 +1 @@
+# file needed for git - don't remove it
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,
-- 
cgit v1.2.3