diff options
| author | David Smith <dsmith@redhat.com> | 2010-03-09 11:51:10 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-03-09 11:51:10 -0600 |
| commit | 962906a7bb0696f6e17a2f9fed0e6072627c1a71 (patch) | |
| tree | 3fb9c4e0767d63e8f18a7a3ea13727c9b0899614 | |
| parent | 4f61df98e2a4a6be4ec5c1d64b04f8f77d369aa0 (diff) | |
| download | systemtap-steved-962906a7bb0696f6e17a2f9fed0e6072627c1a71.tar.gz systemtap-steved-962906a7bb0696f6e17a2f9fed0e6072627c1a71.tar.xz systemtap-steved-962906a7bb0696f6e17a2f9fed0e6072627c1a71.zip | |
Fix PR 11363 by using logrotate to ensure logfile doesn't grow too large.
* initscript/logrotate.stap-server: Add logrotate config file to make sure
stap-server logfile doesn't grow too large.
* systemtap.spec: Install logrotate config file. Also follow
<https://fedoraproject.org/wiki/PackagingDrafts/Logfiles> to correctly
create the logfile.
| -rw-r--r-- | initscript/logrotate.stap-server | 7 | ||||
| -rw-r--r-- | systemtap.spec | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/initscript/logrotate.stap-server b/initscript/logrotate.stap-server new file mode 100644 index 00000000..f07a8a4e --- /dev/null +++ b/initscript/logrotate.stap-server @@ -0,0 +1,7 @@ +/var/log/stap-server/log { + rotate 2 + missingok + notifempty + size 30k + create 0664 stap-server stap-server +} diff --git a/systemtap.spec b/systemtap.spec index f7e14017..d29dac5f 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -307,6 +307,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 644 initscript/config.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/stap-server mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server/log +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -m 644 initscript/logrotate.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/stap-server %clean rm -rf ${RPM_BUILD_ROOT} @@ -327,9 +329,11 @@ test -e ~stap-server && chmod 755 ~stap-server exit 0 %post server -chmod 664 %{_localstatedir}/log/stap-server/log -chown stap-server %{_localstatedir}/log/stap-server/log -chgrp stap-server %{_localstatedir}/log/stap-server/log +test -e %{_localstatedir}/log/stap-server/log || { + touch %{_localstatedir}/log/stap-server/log + chmod 664 %{_localstatedir}/log/stap-server/log + chown stap-server:stap-server %{_localstatedir}/log/stap-server/log +} # If it does not already exit, as stap-server, generate the certificate # used for signing and for ssl. if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then @@ -467,11 +471,12 @@ exit 0 %{_mandir}/man8/stap-server.8* %{_mandir}/man8/stap-authorize-server-cert.8* %{_sysconfdir}/rc.d/init.d/stap-server +%config(noreplace) %{_sysconfdir}/logrotate.d/stap-server %dir %{_sysconfdir}/stap-server %dir %{_sysconfdir}/stap-server/conf.d %config(noreplace) %{_sysconfdir}/sysconfig/stap-server %dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server -%attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log +%ghost %config %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log %doc initscript/README.stap-server %files sdt-devel |