diff options
author | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
commit | 70d2dd696696b14c5011580f994c6520b028f32a (patch) | |
tree | acd91c59fea86768f81d98e262ed1677f646fa47 /manifests/cron/linux.pp | |
parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
parent | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (diff) |
Merge branch 'merge_immerda' into 'master'
Merge immerda's changes
GENERAL CHANGES
* Now uses parameterized classes
* Deprecates all top-scope "$puppet_*" variables
* File source path changed from "site-puppet" to "site_puppet"
master/puppet.conf
* [main] default vardir changed /srv/puppet to /var/lib/puppet
* [main] plugindest removed
* [agent] logdest removed
* [environments] removed
base.pp
* new $puppet::config, $puppet::config_content
cron/base.pp
* new $puppet::cron::cron_time, $puppet::http_compression, $puppet::cron::stop_service
cron.pp
* new puppet::cron parameterized class
debian.pp
* $puppet_ensure_version now $puppet::ensure_version
init.pp
* new puppet parameteried class
* $use_shorewall deprecated
linux.pp
* $facter_ensure_version now $puppet::facter_ensure_version
master/linux.pp
* $puppetmaster_mode changed to $puppet::master::mode
* does not require apache::base
master
* class puppet:puppetmaster::* renamed puppet::master::*
* $puppet_fileserverconfig changed to $puppet::master::fileserver
* added $puppet::master::config_content
* $puppetmaster_storeconfigs changed to $puppet::master::storeconfigs
master/lastruncheck.pp
* $::puppet_lastruncheck_ignorehosts changed to $puppet::master::lastruncheck_ignorehosts
* $::puppet_lastruncheck_ignorehosts_str changed to $puppet::master::lastruncheck_ignorehosts_str
* $::puppet_lastruncheck_timeout_str changed to $puppet::master::lastruncheck_timeout_str
* does not include cron
* /etc/cron.d/puppetlast command changed
master/cleanupreports
* $puppetmaster_cleanup_reports[_dir] changed to $puppet::master::reports[_dir]
* cron filename changed
master/passenger
* does not install puppetmaster-passenger package on Debian anymore
* restart mechanism by creating /etc/puppet/rack/tmp/restart.txt
* does not manage /usr/share/puppet/rack/puppetmasterd/config.ru anymore, config.ru expected at /etc/puppet/rack (check your Apache configs)
See merge request !1
Diffstat (limited to 'manifests/cron/linux.pp')
-rw-r--r-- | manifests/cron/linux.pp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index d0d0e92..3742d48 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -1,25 +1,11 @@ +# 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} * * * *" - } - - include ::cron File['/etc/cron.d/puppetd']{ - source => undef, - content => "#run puppet\n${puppet_crontime} root output=\$(/usr/bin/puppet agent --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, - notify => Service['cron'] + 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", + before => Service['puppet'], } } |