summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-02-06 23:01:05 +0100
committermh <mh@immerda.ch>2011-02-06 23:02:22 +0100
commit1c67b54b5df53f3cb07338729181e8fd22ca24f0 (patch)
tree476a9898fc63ff10f0ee926643886d57f9b3f6fa /manifests
parentc36629568dba81b7e7f8471ed248cf889e53f6a2 (diff)
parent12212a762f3c188fef94f763e3a006e49e3a333b (diff)
Merge remote branch 'leluitn/apache_conf_fix'
Diffstat (limited to 'manifests')
-rw-r--r--manifests/apache.pp17
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"],
+ }
+ }
+ }
}