summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp13
1 files changed, 10 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e80525e..c4d7725 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,7 +5,7 @@
# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
# Copyright 2008, admin(at)immerda.ch
# Copyright 2008, Puzzle ITC GmbH
-# Marcel Härry haerry+puppet(at)puzzle.ch
+# Marcel Haerry haerry+puppet(at)puzzle.ch
# Simon Josi josi+puppet(at)puzzle.ch
#
# This program is free software; you can redistribute
@@ -27,7 +27,12 @@ class nagios(
case $nagios::httpd {
'absent': { }
'lighttpd': { include ::lighttpd }
- 'apache': { include ::apache }
+ 'apache': {
+ include ::apache
+ if $::operatingsystem == 'Debian' {
+ include ::nagios::debian::apache
+ }
+ }
default: { include ::apache }
}
case $::operatingsystem {
@@ -39,7 +44,9 @@ class nagios(
$cfgdir = '/etc/nagios3'
include ::nagios::debian
}
- default: { fail("No such operatingsystem: ${::operatingsystem} yet defined") }
+ default: {
+ fail("No such operatingsystem: ${::operatingsystem} yet defined")
+ }
}
if $manage_munin {
include ::nagios::munin