summaryrefslogtreecommitdiff
path: root/manifests/cron
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-08-30 13:24:04 +0200
committermh <mh@immerda.ch>2014-08-30 13:24:55 +0200
commitb8bd7e5c9208feb09019a395374a04437a8122a4 (patch)
tree404a93abfbbf674b8f8e04eda605a2b0b63e2035 /manifests/cron
parentc80c781fa05f94ac1c8631e068af98a6839b0a4a (diff)
fix cron name globally + linting
Diffstat (limited to 'manifests/cron')
-rw-r--r--manifests/cron/debian.pp7
-rw-r--r--manifests/cron/linux.pp4
2 files changed, 2 insertions, 9 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 9b69dc1..3742d48 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -3,9 +3,9 @@ class puppet::cron::linux inherits puppet::linux {
include puppet::cron::base
- File['/etc/cron.d/puppetd.cron']{
+ File['/etc/cron.d/puppetd']{
source => undef,
- content => "#run puppet\n$puppet::cron::base::crontime root output=\$(/usr/bin/puppet agent --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false ${puppet::cron::base::http_compression_str}); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n",
+ content => "#run puppet\n${puppet::cron::base::crontime} root output=\$(/usr/bin/puppet agent --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false ${puppet::cron::base::http_compression_str}); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n",
before => Service['puppet'],
}
}