diff options
| author | Micah Anderson <micah@riseup.net> | 2011-02-11 00:29:11 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-02-11 00:29:11 -0500 |
| commit | fe73cf4fa70a93cf8ab1ad375c9e9e77a72e20a1 (patch) | |
| tree | 794b6231d340e78fd4e674f32f0d6989ce4e5441 /manifests/linux.pp | |
| parent | 4835560269a3485603aaf70b0e35eba28b4f3571 (diff) | |
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.
Diffstat (limited to 'manifests/linux.pp')
| -rw-r--r-- | manifests/linux.pp | 6 |
1 files changed, 5 insertions, 1 deletions
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" ], |