From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 3 Oct 2010 22:30:09 +0000 (-0300)
Subject: Munin allow master workaround
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=46c1ce7d6d9be6ecc5229463b794e52739c033c2;p=puppet-nodo.git

Munin allow master workaround
---

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,
   }