Merge remote branch 'leluitn/apache_conf_fix'

1 files changed, 17 insertions, 0 deletions

diff --git a/manifests/apache.pp b/manifests/apache.pp
index c00b1d9..c560e5b 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -1,4 +1,21 @@
 class nagios::apache inherits ::apache {
     $nagios_httpd = 'apache'
     include nagios
+
+    case $operatingsystem {
+        'debian': {
+            file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf":
+                ensure => present,
+                source => ["puppet:///site-nagios/configs/${fqdn}/apache2.conf",
+                           "puppet:///site-nagios/configs/apache2.conf",
+                           "puppet:///nagios/configs/apache2.conf"],
+            }
+
+            apache::config::global { "nagios3.conf":
+                ensure => link,
+                target => "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf",
+                require => File["${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf"],
+            }
+        }
+    }
 }