From 2a98b04c08087fc27fea067861c3e4fa08af36a7 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 2 Jan 2013 14:21:59 +0100 Subject: linted cron/linux.pp --- manifests/cron/linux.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index 5003559..33a4535 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -1,11 +1,12 @@ -# 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_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 %>') @@ -13,9 +14,9 @@ class puppet::cron::linux inherits puppet::linux { } 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", - before => Service['puppet'], - ensure => present + 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'], + ensure => present } } -- cgit v1.2.3