From fe73cf4fa70a93cf8ab1ad375c9e9e77a72e20a1 Mon Sep 17 00:00:00 2001 From: Micah Anderson 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/linux.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'manifests/linux.pp') 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