diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-27 22:51:10 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-27 22:51:10 -0400 |
| commit | fecafbacbbb820a01d1cc21b6cc69c24f3c60151 (patch) | |
| tree | 53557ea57de52207960d2a24536fe788f326de24 /manifests/puppetmaster | |
| parent | f54e980211a88b6e470cb34e78e418e7a7b3de2a (diff) | |
| parent | af97bf0e96167e916e36110eb858f257ccf083e6 (diff) | |
Merge remote-tracking branch 'lavamind/master'
Conflicts:
manifests/cron.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/cleanup_reports.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/puppetmaster/cleanup_reports.pp b/manifests/puppetmaster/cleanup_reports.pp index 664bd81..005a4d7 100644 --- a/manifests/puppetmaster/cleanup_reports.pp +++ b/manifests/puppetmaster/cleanup_reports.pp @@ -1,8 +1,8 @@ class puppet::puppetmaster::cleanup_reports { - + case $puppetmaster_reports_dir { '',undef: { $puppetmaster_reports_dir = '/var/lib/puppet/reports' } } # clean up reports older than $puppetmaster_cleanup_reports days file { '/etc/cron.daily/puppet_reports_cleanup.sh': - content => "#!/bin/bash\nfind /var/lib/puppet/reports/ -maxdepth 2 -type f -ctime +${puppetmaster_cleanup_reports} -exec rm {} \\;\n", + content => "#!/bin/bash\nfind ${puppetmaster_reports_dir} -maxdepth 2 -type f -ctime +${puppetmaster_cleanup_reports} -exec rm {} \\;\n", owner => root, group => 0, mode => 0700; } } |