diff options
| author | mh <mh@immerda.ch> | 2010-08-17 15:47:27 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-17 15:47:27 +0200 |
| commit | 06ff06dbfb1073fb96378721414503a420574925 (patch) | |
| tree | 05f685f80cd94e815214d254dda052f1d592fab2 /manifests/cron | |
| parent | 3b311b7ef34ecaf517e5553c72750f059456702a (diff) | |
enable possibility to enforce puppet http_compression
Diffstat (limited to 'manifests/cron')
| -rw-r--r-- | manifests/cron/linux.pp | 4 | ||||
| -rw-r--r-- | manifests/cron/openbsd.pp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index 3343546..6e8baf5 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -2,6 +2,8 @@ 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) @@ -11,6 +13,6 @@ class puppet::cron::linux inherits puppet::linux { File['/etc/cron.d/puppetd.cron']{ source => undef, - content => "# run puppet\n$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n", + content => "# run puppet\n$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false $puppet_http_compression_str | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n", } } diff --git a/manifests/cron/openbsd.pp b/manifests/cron/openbsd.pp index 5575326..39e6212 100644 --- a/manifests/cron/openbsd.pp +++ b/manifests/cron/openbsd.pp @@ -1,6 +1,7 @@ class puppet::cron::openbsd inherits puppet::openbsd { 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) @@ -19,7 +20,7 @@ class puppet::cron::openbsd inherits puppet::openbsd { } cron { 'puppetd_run': - command => "/usr/local/sbin/puppet agent --onetime --no-daemonize --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'", + command => "/usr/local/sbin/puppet agent --onetime --no-daemonize --config=$puppet_config --color false $puppet_http_compression_str | grep -E '(^err:|^alert:|^emerg:|^crit:)'", user => 'root', minute => split(regsubst($puppet_crontime,'^([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+)$','\1'),','), hour => split(regsubst($puppet_crontime,'^([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+)$','\2'),','), |