From 8c754f67a4141f0b858117ecf33670f679d6a226 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 12 Jun 2010 18:08:43 -0300
Subject: Changes on nodo::master

---
 manifests/master.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/master.pp')

diff --git a/manifests/master.pp b/manifests/master.pp
index 4158524..23b78d2 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -4,13 +4,14 @@ class nodo::master {
   }
 
   # Puppetmaster should be included before nodo::vserver
+  include puppetmasterd
+
   if $main_master == true {
-    include puppetmasterd
     include munin::host
     include nagios::headless
     include nagios::defaults
 
-    # TODO: nagios apache workaround
+    # Nagios apache workaround
     file { "/etc/apache2/conf.d/nagios3.conf":
       ensure => absent,
     }
@@ -23,7 +24,6 @@ class nodo::master {
       alias  => ["puppet.$domain"],
     }
   } else {
-    include puppetmasterd::disabled
     host { "puppet":
       ensure => absent,
     }
-- 
cgit v1.2.3