diff options
author | mh <mh@immerda.ch> | 2015-10-25 14:43:23 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2015-10-25 14:44:25 +0100 |
commit | edd580ab2dc92adcb8291fd17d268cfbb6226c3b (patch) | |
tree | 2c713b514212c71d67ae90d6f31041630941a616 /manifests/init.pp | |
parent | cfff7d115e4cff2a4aa5bcfbd01e7ebe265b7a48 (diff) | |
parent | f215de3de43f141ae71fd124a84003d157da7295 (diff) |
Merge remote-tracking branch 'shared/master'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 13 |
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 |