aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-07 23:11:09 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-07 23:11:09 -0300
commit002d3f0d3802ff70ddbe8d9e80ed504155a13313 (patch)
tree88ac48c1c27c1b9c7185db0f8dc4d7494e56be46
parent4cd99a3ed806b6bc8904a2029197b1f68dbd3d3a (diff)
downloadpuppet-nodo-002d3f0d3802ff70ddbe8d9e80ed504155a13313.tar.gz
puppet-nodo-002d3f0d3802ff70ddbe8d9e80ed504155a13313.tar.bz2
Nagios apache workaround
-rw-r--r--manifests/master.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 5e1c049..e9e4562 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -9,6 +9,11 @@ class nodo::master {
include munin::host
include nagios
+ # TODO: nagios apache workaround
+ file { "/etc/apache2/conf.d/nagios3.conf":
+ ensure => absent,
+ }
+
# The main master has a host entry pointing to itself, other
# masters still retrieve catalogs from the main master.
host { "puppet":