]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Munin allow master workaround
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 3 Oct 2010 22:30:09 +0000 (19:30 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 3 Oct 2010 22:30:09 +0000 (19:30 -0300)
manifests/master.pp

index c176ca99b122c2653e7bafdf9ade9fc9e62f1876..c5c23da2bb1bd72cfb5b61dfd807507e38320918 100644 (file)
@@ -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,
   }