From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 13 Apr 2013 21:18:33 +0000 (-0300)
Subject: Master class shall not include the daemon
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ba0c4fedf86e594c307aa514c982faaa988ab493;p=puppet-puppet.git

Master class shall not include the daemon
---

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 6b17f8d..7489b6e 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,4 +1,3 @@
-# handles puppetd service
 class puppet::daemon(
   $master        = false,
   $ensure        = hiera('puppet::daemon::ensure',       ''),
diff --git a/manifests/master.pp b/manifests/master.pp
index 8ea4928..2d34b91 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -19,11 +19,6 @@ class puppet::master(
     include puppet::master::ca
   }
 
-  # then include the daemon
-  class { 'puppet::daemon':
-    master => true,
-  }
-
   # needed packages
   package {
     "sqlite3":           ensure => installed;