diff options
| author | Micah <micah@riseup.net> | 2015-10-05 23:16:03 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-05 23:16:03 +0000 |
| commit | 2cd1b529fc18847712760b15c9412b10d1cee712 (patch) | |
| tree | 5acf3f805be3da4c7094cf364f345630ec1e06dc /manifests/init.pp | |
| parent | 63b80c9c238b19635665cfe20c2c8bd79994ab15 (diff) | |
| parent | 93a00004cfea3e8a4c85d1bbdaaaac5e5ced118f (diff) | |
Merge branch 'fix_apache' into 'master'
Fix apache
the main class is currently unusable with apache, which is the default case.
we need to move management of files necessary for nagios+apache+debian into the "nagios" class to fix this.
This partly responds to #4
See merge request !12
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c62c480..c800637 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,7 +24,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 { @@ -36,7 +41,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 |