From 923304d7b5b6f05df161e0c388d61c9b0b98c210 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 2 Jan 2013 13:44:21 +0100
Subject: linted checklastrun.pp

---
 manifests/puppetmaster/checklastrun.pp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index 93ed8b9..f89edd0 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -1,25 +1,29 @@
 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}"
   }
 
   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',
   }
 }
-- 
cgit v1.2.3


From 18b8da26f9ed976ccb908000014a275899797567 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 2 Jan 2013 14:23:41 +0100
Subject: added service dependency for cron

---
 manifests/puppetmaster/checklastrun.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index f89edd0..b57ec05 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -25,5 +25,6 @@ class puppet::puppetmaster::checklastrun {
       owner   => root,
       group   => 0,
       mode    => '0644',
+      notify  => service['cron']
   }
 }
-- 
cgit v1.2.3


From 413b964ec31f9eb6035ecb4c5e38a90f1eee596f Mon Sep 17 00:00:00 2001
From: Gabriel Filion <lelutin@gmail.com>
Date: Wed, 2 Jan 2013 10:39:48 -0500
Subject: cron service dependancy has some errors and misses the cron class

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
---
 manifests/puppetmaster/checklastrun.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index b57ec05..5a1b1c8 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -12,6 +12,8 @@ class puppet::puppetmaster::checklastrun {
     default => "--timeout ${::puppet_lastruncheck_timeout}"
   }
 
+  include ::cron
+
   file{
     '/usr/local/sbin/puppetlast':
       source => [ 'puppet:///modules/puppet/master/lastruncheck' ],
@@ -25,6 +27,6 @@ class puppet::puppetmaster::checklastrun {
       owner   => root,
       group   => 0,
       mode    => '0644',
-      notify  => service['cron']
+      notify  => Service['cron']
   }
 }
-- 
cgit v1.2.3