diff options
author | varac <varacanero@zeromail.org> | 2015-10-06 14:32:42 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-10-06 14:32:42 +0200 |
commit | 70afab799b8cf720cd12bd225c1c2948fd1597ee (patch) | |
tree | 9cfe2d117de723f519e13908c2a41d09bba6c083 /manifests/init.pp | |
parent | 6c3ca97f1524e2b6242c27a2c97dbfb78105889f (diff) | |
parent | 2cd1b529fc18847712760b15c9412b10d1cee712 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
manifests/apache.pp
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 1221950..088286f 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 @@ -25,7 +25,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 { @@ -37,7 +42,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 |