diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-23 18:32:22 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-23 18:32:22 -0300 |
| commit | bf54a79d0eb9dcccbd5d6a6c48b1081708a90d59 (patch) | |
| tree | 667ddb82894a3a8f609c9022274cd703219b3460 /manifests/puppetmasterd.pp | |
| parent | 4056e605ccc910c3b5bcabce0649909db4f4b87a (diff) | |
| download | puppet-puppet-bf54a79d0eb9dcccbd5d6a6c48b1081708a90d59.tar.gz puppet-puppet-bf54a79d0eb9dcccbd5d6a6c48b1081708a90d59.tar.bz2 | |
Puppetlast still working for 0.25.4
Diffstat (limited to 'manifests/puppetmasterd.pp')
| -rw-r--r-- | manifests/puppetmasterd.pp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp index c3504fa..a961cad 100644 --- a/manifests/puppetmasterd.pp +++ b/manifests/puppetmasterd.pp @@ -89,17 +89,6 @@ class puppetmasterd { require => [ File["/usr/local/sbin/update-puppet-conf.sh"], User["puppet"] ], } - # cron rule to execute puppetlast once a week as a report - cron { "puppetlast": - command => "/usr/local/sbin/puppetlast", - user => root, - hour => "0", - minute => "0", - weekday => "0", - ensure => absent, - require => File["/usr/local/sbin/puppetlast"], - } - # cron rule to restart puppetmaster before restarting the nodes cron { "puppetmaster-restart": command => "/etc/init.d/puppetmaster restart > /dev/null 2>&1", @@ -109,14 +98,29 @@ class puppetmasterd { ensure => absent, } + # cron rule to execute puppetlast once a week as a report + # currently not working for puppet 2.6.x + cron { "puppetlast": + command => "/usr/local/sbin/puppetlast", + user => root, + hour => "0", + minute => "0", + weekday => "0", + ensure => $puppetversion ? { + "0.25.4" => present, + default => absent, + }, + require => File["/usr/local/sbin/puppetlast"], + } + # custom puppetlast command, thanks to immerda module: # http://git.puppet.immerda.ch/?p=module-puppet.git;a=summary # # right now it's not working, see # https://labs.riseup.net/code/issues/2515 file { "/usr/local/sbin/puppetlast": - ensure => absent, source => "puppet:///modules/puppet/lastruncheck", + ensure => absent, owner => root, group => root, mode => 0700, |