Skip to content

Commit

Permalink
(PUP-3632) Update EL and Debian logrotate for AIO log path
Browse files Browse the repository at this point in the history
With the AIO agent, puppet agent log files are moving to
/var/log/puppetlabs/agent. This commit updates the Debian
and EL logrotate configurations for the new layout.

In addition, this commit removes the signal sent to the
'puppet master' process, since this is no longer needed
with Puppet 4.
  • Loading branch information
Geoff Nichols authored and joshcooper committed Feb 20, 2015
1 parent b8fa8bf commit 62b952b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions ext/debian/puppet.logrotate
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/var/log/puppet/*log {
/var/log/puppetlabs/agent/puppet.log {
missingok
sharedscripts
create 0644 puppet puppet
compress
rotate 4

postrotate
pkill -USR2 -u puppet -f 'puppet master' || true
[ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
endscript
}
3 changes: 1 addition & 2 deletions ext/redhat/logrotate
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/var/log/puppet/*log {
/var/log/puppetlabs/agent/puppet.log {
missingok
notifempty
create 0644 puppet puppet
sharedscripts
postrotate
pkill -USR2 -u puppet -f 'puppet master' || true
[ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
endscript
}

0 comments on commit 62b952b

Please sign in to comment.