diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 11:26:56 -0500 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 11:26:56 -0500 |
| commit | 87b8cf7133beb4c9dd6f6e7692d374d302f8ea5a (patch) | |
| tree | 97c24ea735930366b85cc8d54cdfca044a6fa810 /manifests/cron | |
| parent | 413b964ec31f9eb6035ecb4c5e38a90f1eee596f (diff) | |
Make all linux distributions use the same path for the cron file
This simplifies the hierarchy and fixes the problem that going from
puppet::cron to puppet under debian doesn't remove the cron file.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Diffstat (limited to 'manifests/cron')
| -rw-r--r-- | manifests/cron/debian.pp | 7 | ||||
| -rw-r--r-- | manifests/cron/linux.pp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/manifests/cron/debian.pp b/manifests/cron/debian.pp deleted file mode 100644 index 0b4bd61..0000000 --- a/manifests/cron/debian.pp +++ /dev/null @@ -1,7 +0,0 @@ -class puppet::cron::debian inherits puppet::cron::linux { - - File['/etc/cron.d/puppetd.cron']{ - path => '/etc/cron.d/puppetd', - } - -} diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index e00b4d0..f5b0ebb 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -15,7 +15,7 @@ class puppet::cron::linux inherits puppet::linux { include ::cron - File['/etc/cron.d/puppetd.cron']{ + File['/etc/cron.d/puppetd']{ source => undef, content => "#run puppet\n${puppet_crontime} root output=\$(/usr/sbin/puppetd --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n", before => Service['puppet'], |