Merge remote branch 'immerda/master' into immerda

Conflicts:
	manifests/puppetmaster/checklastrun.pp
	manifests/puppetmaster/checklastrun/disable.pp

3 files changed, 23 insertions, 10 deletions

diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 36116b4..41d8021 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -13,11 +13,11 @@ class puppet::puppetmaster inherits puppet {
   include puppet::puppetmaster::base
 
 
-  case $puppetmaster_checklastrun {
-    '': { $puppetmaster_checklastrun = '40 10,22 * * *' }
+  case $puppetmaster_lastruncheck_cron {
+    '',undef: { $puppetmaster_lastruncheck_cron = '40 10 * * *' }
   }
 
-  if $puppetmaster_checklastrun {
+  if $puppetmaster_lastruncheck_cron {
     include puppet::puppetmaster::checklastrun
   } else {
     include puppet::puppetmaster::checklastrun::disable
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index 685d6b4..17f4553 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -1,13 +1,24 @@
 class puppet::puppetmaster::checklastrun {
 
-  file {
-    '/usr/local/bin/puppetlast':
-      source => [ "puppet:///modules/site-puppet/master/puppetlast",
-                  "puppet:///modules/puppet/master/puppetlast" ],
+  $puppet_lastruncheck_ignorehosts_str = $puppet_lastruncheck_ignorehosts ? {
+    '' => '',
+    undef => '',
+    default => "--ignore-hosts ${puppet_lastruncheck_ignorehosts}"
+  }
+
+  $puppet_lastruncheck_timeout_str = $puppet_lastruncheck_timeout ? {
+    '' => '',
+    undef => '',
+    default => "--timeout ${puppet_lastruncheck_timeout}"
+  }
+
+  file{
+    '/usr/local/sbin/puppetlast':
+      source => [ "puppet:///modules/puppet/master/lastruncheck" ],
       owner => root, group => 0, mode => 0700;
-  
+
     '/etc/cron.d/puppetlast.cron':
-      content => "${puppetmaster_checklastrun} root /usr/local/bin/puppetlast ${puppetmaster_checklastrun_timeout}\n",
+      content => "${puppetmaster_lastruncheck_cron} root /usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions}\n",
       require => File["/usr/local/bin/puppetlast"],
       owner => root, group => 0, mode => 0644,
   }
diff --git a/manifests/puppetmaster/checklastrun/disable.pp b/manifests/puppetmaster/checklastrun/disable.pp
index 1ab4648..8fff212 100644
--- a/manifests/puppetmaster/checklastrun/disable.pp
+++ b/manifests/puppetmaster/checklastrun/disable.pp
@@ -1,8 +1,10 @@
 class puppet::puppetmaster::checklastrun::disable inherits puppet::puppetmaster::checklastrun {
 
-  File['/usr/local/bin/puppetlast']{
+  File['/usr/local/sbin/puppetlast']{
+    source => undef,
     ensure => absent,
   }
+
   File['/etc/cron.d/puppetlast.cron']{
     ensure => absent,
   }