From 52e40ff06a6f837b19b0ea37ce04294a52a9c2e1 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Wed, 22 Apr 2015 00:14:36 +0200
Subject: [PATCH] enable daemonize properly

---
 manifests/agent.pp  | 14 +++++++++++++-
 manifests/server.pp | 11 ++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/manifests/agent.pp b/manifests/agent.pp
index 11ca4cf..699effc 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -9,7 +9,7 @@ class puppet::agent (
   $puppet_master   = undef,
   $splay           = true,
   $cron            = true,
-  $environment     = gsub($::domain, '.(maketank.net|bitwig.com)', '')) {
+  $environment     = gsub($::domain, '.(maketank.net|bitwig.com|lan)$', '')) {
   case $::kernel {
     'Linux' : {
       $puppetpkgs = ['puppet', 'puppet-common']
@@ -53,6 +53,18 @@ class puppet::agent (
     default => $ensure,
   }
 
+  if $daemonize == true {
+    common::replace { '/etc/default/puppet':
+      pattern     => 'START=no',
+      replacement => "START=yes"
+    }
+  } else {
+    common::replace { '/etc/default/puppet':
+      pattern     => 'START=yes',
+      replacement => "START=no"
+    }
+  }
+
   cron { 'puppetrun':
     command => '/usr/local/sbin/puppetd_run.sh',
     user    => 'root',
diff --git a/manifests/server.pp b/manifests/server.pp
index d6c3861..791071e 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -5,23 +5,16 @@ class puppet::server (
   $storeconfigs_backend = undef,
   $reports              = undef,
   $basemodulepath       = undef,
-  $version              = undef,
   $passenger            = true) {
   if $passenger == true {
     $pkg = 'puppetmaster-passenger'
   } else {
     $pkg = 'puppetmaster'
   }
-  $pkg_ens = $ensure ? {
-    'present' => $::kernel ? {
-      'Linux' => $version,
-      default => $ensure,
-    },
-    default   => $ensure,
+  package { ['puppetmaster-common', $pkg]: 
+  #ensure => $ensure, 
   }
 
-  package { ['puppetmaster-common', $pkg]: ensure => $pkg_ens, }
-
   # ## remove disk reports from time to time
   tidy { "${::puppet_vardir}/reports":
     age     => '4w',