summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2015-10-02 18:26:45 -0400
committerGabriel Filion <gabster@lelutin.ca>2015-10-02 19:12:05 -0400
commit2ee46c9a31a56110a38d5a076af84448643bd85b (patch)
treed8d0ade5839c6caf3bc9c7166829fde9aa2d52ea /manifests/init.pp
parent63b80c9c238b19635665cfe20c2c8bd79994ab15 (diff)
files managed for apache on debian break usage through main class
Currently the nagios::apache class manages some files for debian. This means that when using the main class for setting up nagios with apache (which is the default!) lacks those files and the setup doesn't work. Split out management of those files into another class to avoid making the code in the main class too encumbered and make the main class include that (instead of nagios::apache). nagios::apache will include the main class anyway. Adjust README file so that all cases of http management are done through the "nagios" class.
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c62c480..4c68961 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 {