diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-11 12:30:51 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-11 12:30:51 -0400 |
| commit | 7735baa65f0dc37f94d4854fd62c817de94d64f2 (patch) | |
| tree | 1a4e7a70e27897e08e0e0bb754b4b4d1f2889967 /manifests/apache.pp | |
| parent | 2f2eb1cb12a57d8a85801086b6fbfce19e9c7a1b (diff) | |
| parent | f2df62c9d17d481a3d616a4f2de9496638fadc0a (diff) | |
Merge commit 'f2df62c9d17d481a3d616a4f2de9496638fadc0a'
Conflicts:
manifests/defaults/commands.pp
Diffstat (limited to 'manifests/apache.pp')
| -rw-r--r-- | manifests/apache.pp | 17 |
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"], + } + } + } } |