diff options
author | mh <mh@immerda.ch> | 2012-06-05 18:59:39 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-08 13:09:47 -0300 |
commit | 09c8eaf304d1075980d8d9143545f2f16a1db34d (patch) | |
tree | 57ab2c761e74eb95f873b72a109c2a620656469b /manifests/cron/linux.pp | |
parent | af97bf0e96167e916e36110eb858f257ccf083e6 (diff) |
new style for 2.7
Diffstat (limited to 'manifests/cron/linux.pp')
-rw-r--r-- | manifests/cron/linux.pp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index bab9564..5452cc7 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -1,20 +1,11 @@ -# manifests/cron/linux.pp +# manifests/cron/linux.pp class puppet::cron::linux inherits puppet::linux { include puppet::cron::base - if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } - if $puppet_http_compression { $puppet_http_compression_str = '--http_compression' } - - - if !$puppet_crontime { - $puppet_crontime_interval_minute = fqdn_rand(29) - $puppet_crontime_interval_minute2 = inline_template('<%= 30+puppet_crontime_interval_minute.to_i %>') - $puppet_crontime = "${puppet_crontime_interval_minute},${puppet_crontime_interval_minute2} * * * *" - } File['/etc/cron.d/puppetd.cron']{ 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", + content => "#run puppet\n$puppet::cron::base::crontime root output=\$(/usr/sbin/puppetd --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'], } } |