summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-29 16:18:10 -0400
committerMicah Anderson <micah@leap.se>2013-08-29 16:18:10 -0400
commit40a4e7a9e939bbf5a8cd550dd6e64c029eb83273 (patch)
tree6609f4f9ce5769c4d5797a76afee1684281ddb5c /puppet/modules/site_nagios/manifests
parent1f66ee794114d6a7096e15d0b044c17cb6d22a91 (diff)
parent323ceff1ea60bd3463821fc2295ffb790d822165 (diff)
Merge branch 'bug/3612' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 5ca04da2..a088921a 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -18,9 +18,7 @@ class site_nagios::server inherits nagios::base {
#before => Class ['nagios::defaults']
}
- apache::module {
- 'headers': ensure => present;
- }
+ include site_apache::module::headers
File ['nagios_htpasswd'] {
source => undef,