From 7a2faa981e91c0a224544cdfa502ac82686fa757 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jun 2008 20:17:12 +0000
Subject: Merge commit 'puzzle/development'

---
 manifests/init.pp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index b0b7b53..9e66978 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,18 @@
+#
+# nagios module
 # nagios.pp - everything nagios related
+#
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
-# See LICENSE for the full license granted to you.
-# adapted and improved by admin(at)immerda.ch
-# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch
-
+# Copyright 2008, admin(at)immerda.ch
+# Copyright 2008, Puzzle ITC GmbH
+# Marcel Härry haerry+puppet(at)puzzle.ch
+# Simon Josi josi+puppet(at)puzzle.ch
+#
+# This program is free software; you can redistribute 
+# it and/or modify it under the terms of the GNU 
+# General Public License version 3 as published by 
+# the Free Software Foundation.
+#
 
 # the directory containing all nagios configs:
 $nagios_cfgdir = '/var/lib/puppet/modules/nagios'
@@ -117,7 +126,7 @@ class nagios::base {
     Nagios_serviceextinfo <<||>>
     Nagios_timeperiod <<||>>
 
-    if defined(Class["munin::client"]) {
+    if $use_munin {
         include munin::plugins::nagios
     }
 } # end nagios::base
-- 
cgit v1.2.3