Rollback and cleanup

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 1102398c8926f48d1d190033a41947108c5590eb..8c6e583d0bb98b8cb463c62fb42b893201a7efe1 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,7 +1,6 @@
 # handles puppetd service
 class puppet::daemon(
   $master        = false,
-  $main_master   = false,
   $ensure        = hiera('puppet::daemon::ensure',       ''),
   $port          = hiera('puppet::daemon::port',         "8140"),
   $runinterval   = hiera('puppet::daemon::runinterval',  "7200"),
@@ -51,19 +50,14 @@ class puppet::daemon(
     $agent_name = 'agent'
   }
 
-  # Default config file for puppet nodes
-  if ($master != true) or ($main_master != true) {
-    file { "/etc/puppet/puppet.conf":
-      ensure  => file,
-      owner   => puppet,
-      group   => puppet,
-      content => template("puppet/puppet-node.conf.erb"),
-    }
-  } else {
-    file { "/etc/puppet/puppet.conf":
-      ensure  => file,
-      owner   => puppet,
-      group   => puppet,
+  # Puppet config file
+  file { "/etc/puppet/puppet.conf":
+    ensure  => file,
+    owner   => puppet,
+    group   => puppet,
+    content => $master ? {
+      true    => undef, # the content is in the git repo
+      default => template("puppet/puppet-node.conf.erb"),
     }
   }
 

diff --git a/manifests/master.pp b/manifests/master.pp
index 2d34b916336ea130943674fa59a6220fac414e16..8ea49289c6b72507da50394ee18fc2019c507f69 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -19,6 +19,11 @@ class puppet::master(
     include puppet::master::ca
   }
 
+  # then include the daemon
+  class { 'puppet::daemon':
+    master => true,
+  }
+
   # needed packages
   package {
     "sqlite3":           ensure => installed;