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

1 files changed, 23 insertions, 0 deletions

diff --git a/manifests/debian/apache.pp b/manifests/debian/apache.pp
new file mode 100644
index 0000000..095091e
--- /dev/null
+++ b/manifests/debian/apache.pp
@@ -0,0 +1,23 @@
+# Handle files that are specifically needed for nagios with apache on debian
+#
+# Do not include this class directly. It is included by the nagios class and
+# needs variables from it.
+#
+class nagios::debian::apache {
+
+  include nagios::defaults::vars
+
+  file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf":
+    ensure => present,
+    source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/apache2.conf",
+                'puppet:///modules/site_nagios/configs/apache2.conf',
+                'puppet:///modules/nagios/configs/apache2.conf'],
+  }
+
+  apache::config::global { 'nagios3.conf':
+    ensure  => link,
+    target  => "${nagios::defaults::vars::int_cfgdir}/apache2.conf",
+    require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"],
+  }
+
+}