From 77664cb4061fa154d348d6cd17e612a2302d3d6b Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Thu, 30 Apr 2015 15:16:49 -0600 Subject: [PATCH] libxl: add logrotate config file Add logrotate config for log files in /var/log/libvirt/libxl. --- daemon/Makefile.am | 13 ++++++++++++- daemon/libvirtd.libxl.logrotate.in | 9 +++++++++ libvirt.spec.in | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 daemon/libvirtd.libxl.logrotate.in diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 974feed2f4..42dec5d79c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -63,6 +63,7 @@ EXTRA_DIST = \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ libvirtd.lxc.logrotate.in \ + libvirtd.libxl.logrotate.in \ libvirtd.uml.logrotate.in \ test_libvirtd.aug.in \ THREADS.txt \ @@ -288,7 +289,8 @@ remote.c: $(DAEMON_GENERATED) remote.h: $(DAEMON_GENERATED) LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ - libvirtd.uml.logrotate libvirtd.logrotate + libvirtd.libxl.logrotate libvirtd.uml.logrotate \ + libvirtd.logrotate BUILT_SOURCES += $(LOGROTATE_CONFS) @@ -310,6 +312,12 @@ libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in < $< > $@-t && \ mv $@-t $@ +libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + libvirtd.uml.logrotate: libvirtd.uml.logrotate.in $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -327,6 +335,8 @@ install-logrotate: $(LOGROTATE_CONFS) $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu $(INSTALL_DATA) libvirtd.lxc.logrotate \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc + $(INSTALL_DATA) libvirtd.libxl.logrotate \ + $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl $(INSTALL_DATA) libvirtd.uml.logrotate \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml @@ -334,6 +344,7 @@ uninstall-logrotate: rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc \ + $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || : rmdir $(DESTDIR)$(localstatedir)/log/libvirt/lxc || : diff --git a/daemon/libvirtd.libxl.logrotate.in b/daemon/libvirtd.libxl.logrotate.in new file mode 100644 index 0000000000..523b2f8371 --- /dev/null +++ b/daemon/libvirtd.libxl.logrotate.in @@ -0,0 +1,9 @@ +@localstatedir@/log/libvirt/libxl/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/libvirt.spec.in b/libvirt.spec.in index 8b12ab68c7..4195518f9d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1601,6 +1601,7 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc %endif %if ! %{with_libxl} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %endif @@ -2018,6 +2019,7 @@ exit 0 %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ @@ -2140,6 +2142,7 @@ exit 0 %files daemon-driver-libxl %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug