aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-10-03 19:30:09 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-10-03 19:30:09 -0300
commit46c1ce7d6d9be6ecc5229463b794e52739c033c2 (patch)
treeda4e9a91f64b4e8fe416c24ba021a7746acdafe3
parent402dad753dccc7f3094ed0cb8f02806835ab5c92 (diff)
downloadpuppet-nodo-46c1ce7d6d9be6ecc5229463b794e52739c033c2.tar.gz
puppet-nodo-46c1ce7d6d9be6ecc5229463b794e52739c033c2.tar.bz2
Munin allow master workaround
-rw-r--r--manifests/master.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index c176ca9..c5c23da 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -7,6 +7,10 @@ class nodo::master {
# Puppetmaster should be included before nodo::vserver
include puppetmasterd
+ # This is a workaround to correctly set allowed hosts on munin
+ # client when the host is also present.
+ $munin_allow = $global_munin_allow
+
include munin::host
include munin::plugins::muninhost
include nagios::headless
@@ -42,7 +46,7 @@ class nodo::master {
'': { fail("Please set \$puppetmaster_db_password in your host config") }
}
- # update master's puppet.conf if you change here
+ # Update master's puppet.conf if you change here
database::instance { "puppet":
password => "$puppetmaster_db_password",
}
@@ -53,7 +57,7 @@ class nodo::master {
sqldump => true,
}
- # used for trac dependency graphs
+ # Used for trac dependency graphs
package { "graphviz":
ensure => present,
}