From fe73cf4fa70a93cf8ab1ad375c9e9e77a72e20a1 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 11 Feb 2011 00:29:11 -0500
Subject: make a puppet::cron::debian class that includes the override of the
 /etc/cron.d/puppetd.cron file resource and move the override from
 manifests/debian.pp.

/etc/cron.d/puppetd.cron is not a valid cronjob according to the run-parts system that Debian uses to decide what is valid, as a result if you were to 'include puppet::cron' in your manifests on a debian/debian-derived system, then a cronjob would be created that would never be executed.
---
 manifests/cron.pp        | 1 +
 manifests/cron/debian.pp | 7 +++++++
 manifests/debian.pp      | 4 ----
 manifests/linux.pp       | 6 +++++-
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 manifests/cron/debian.pp

diff --git a/manifests/cron.pp b/manifests/cron.pp
index 8d41174..5f46f67 100644
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -3,6 +3,7 @@
 class puppet::cron inherits puppet {
   case $kernel {
     linux: { include puppet::cron::linux }
+    debian: { include puppet::cron::debian }
     openbsd: { include puppet::cron::openbsd }
     default: { include puppet::cron::base }
   }
diff --git a/manifests/cron/debian.pp b/manifests/cron/debian.pp
new file mode 100644
index 0000000..0b4bd61
--- /dev/null
+++ b/manifests/cron/debian.pp
@@ -0,0 +1,7 @@
+class puppet::cron::debian inherits puppet::cron::linux {
+
+  File['/etc/cron.d/puppetd.cron']{
+    path => '/etc/cron.d/puppetd',
+  }
+
+}
diff --git a/manifests/debian.pp b/manifests/debian.pp
index de5be53..9653e76 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -21,10 +21,6 @@ class puppet::debian inherits puppet::linux {
   Service[puppet]{
     hasstatus => $real_puppet_hasstatus,
   }
-  
-  File['/etc/cron.d/puppetd.cron']{
-    path => '/etc/cron.d/puppetd',
-  }
 }
 
 
diff --git a/manifests/linux.pp b/manifests/linux.pp
index 3a35d75..c040bb4 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -14,7 +14,11 @@ class puppet::linux inherits puppet::base {
     require => Package[puppet],
   }
 
-  file { '/etc/cron.d/puppetd.cron':
+  # this is to clean up an invalid cron name from a previous version
+  # at some point, this should be removed
+  file { '/etc/cron.d/puppetd.cron': ensure => absent }
+  
+  file { '/etc/cron.d/puppetd':
     source => [ "puppet:///modules/site-puppet/cron.d/puppetd",
                 "puppet:///modules/puppet/cron.d/puppetd.${operatingsystem}",
                 "puppet:///modules/puppet/cron.d/puppetd" ],
-- 
cgit v1.2.3