Merge branch 'puppet_cron'

Conflicts:
	manifests/cron.pp
	manifests/linux.pp

take the changes from puppet_cron

1 files changed, 19 insertions, 12 deletions

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index 93ed8b9..5a1b1c8 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -1,25 +1,32 @@
 class puppet::puppetmaster::checklastrun {
 
-  $puppet_lastruncheck_ignorehosts_str = $puppet_lastruncheck_ignorehosts ? {
-    '' => '',
-    undef => '',
-    default => "--ignore-hosts ${puppet_lastruncheck_ignorehosts}"
+  $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}"
+  $puppet_lastruncheck_timeout_str = $::puppet_lastruncheck_timeout ? {
+    ''      => '',
+    undef   => '',
+    default => "--timeout ${::puppet_lastruncheck_timeout}"
   }
 
+  include ::cron
+
   file{
     '/usr/local/sbin/puppetlast':
-      source => [ "puppet:///modules/puppet/master/lastruncheck" ],
-      owner => root, group => 0, mode => 0700;
+      source => [ 'puppet:///modules/puppet/master/lastruncheck' ],
+      owner  => root,
+      group  => 0,
+      mode   => '0700';
 
     '/etc/cron.d/puppetlast.cron':
       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/sbin/puppetlast"],
-      owner => root, group => 0, mode => 0644,
+      require => File['/usr/local/sbin/puppetlast'],
+      owner   => root,
+      group   => 0,
+      mode    => '0644',
+      notify  => Service['cron']
   }
 }