daemon: move logrotate files to src/remote/

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/.gitignore b/.gitignore
index 743646e56a48e2191bf242e95aca8a632821da30..2ca7d9776e2e66c929cd98f60a49dfdc4b480d8b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@
 /configure
 /configure.lineno
 /conftest.*
-/daemon/libvirtd*.logrotate
 /docs/aclperms.htmlinc
 /docs/apibuild.py.stamp
 /docs/devhelp/libvirt.devhelp
@@ -135,6 +134,7 @@
 /src/libvirt_*probes.h
 /src/libvirt_lxc
 /src/libvirtd
+/src/libvirtd*.logrotate
 /src/libvirtd.policy
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf

diff --git a/Makefile.am b/Makefile.am
index 5a805b5ee820320860cd3048ef324d992916d5d3..0d46c16c225320240b947b8ec36f75d4bef75dda 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 LCOV = lcov
 GENHTML = genhtml
 
-SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \
+SUBDIRS = . gnulib/lib include/libvirt src tools docs gnulib/tests \
   tests po examples
 
 XZ_OPT ?= -v -T0

diff --git a/configure.ac b/configure.ac
index 7997ec5a146150ae4373fa2ec591998e07b78473..5e720d1b76ef84374ebc4a1aefc16cf9ef12e9c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -916,7 +916,6 @@ AC_CONFIG_FILES([\
         libvirt.spec mingw-libvirt.spec \
         po/Makefile.in \
         include/libvirt/libvirt-common.h \
-        daemon/Makefile \
         examples/Makefile \
         tests/Makefile \
         tools/Makefile])

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
deleted file mode 100644 (file)
index 08ee62c..0000000
--- a/daemon/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-## Copyright (C) 2005-2015 Red Hat, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-CLEANFILES =
-
-DISTCLEANFILES =
-EXTRA_DIST = \
-       libvirtd.logrotate.in \
-       libvirtd.qemu.logrotate.in \
-       libvirtd.lxc.logrotate.in \
-       libvirtd.libxl.logrotate.in \
-       libvirtd.uml.logrotate.in \
-       $(NULL)
-
-BUILT_SOURCES =
-
-if WITH_LIBVIRTD
-
-
-
-install-data-local: install-logrotate
-       $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \
-                  $(DESTDIR)$(localstatedir)/run/libvirt \
-                  $(DESTDIR)$(localstatedir)/lib/libvirt
-
-uninstall-local:: uninstall-logrotate
-       rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
-       rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
-       rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
-
-LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
-                 libvirtd.libxl.logrotate libvirtd.uml.logrotate \
-                 libvirtd.logrotate
-
-BUILT_SOURCES += $(LOGROTATE_CONFS)
-
-libvirtd.logrotate: libvirtd.logrotate.in
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-       mv $@-t $@
-
-libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-       mv $@-t $@
-
-libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-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' \
-           < $< > $@-t && \
-           mv $@-t $@
-
-install-logrotate: $(LOGROTATE_CONFS)
-       $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt/qemu/ \
-                  $(DESTDIR)$(localstatedir)/log/libvirt/lxc/ \
-                  $(DESTDIR)$(localstatedir)/log/libvirt/uml/ \
-                  $(DESTDIR)$(sysconfdir)/logrotate.d/
-       $(INSTALL_DATA) libvirtd.logrotate \
-               $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
-       $(INSTALL_DATA) libvirtd.qemu.logrotate \
-               $(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
-
-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 || :
-       rmdir $(DESTDIR)$(localstatedir)/log/libvirt/uml || :
-       rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
-
-else ! WITH_LIBVIRTD
-install-data-local:
-uninstall-local::
-endif ! WITH_LIBVIRTD
-
-
-CLEANFILES += $(BUILT_SOURCES)
-CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda

diff --git a/daemon/libvirtd.libxl.logrotate.in b/daemon/libvirtd.libxl.logrotate.in
deleted file mode 100644 (file)
index cb7f07d..0000000
--- a/daemon/libvirtd.libxl.logrotate.in
+++ /dev/null
@@ -1,8 +0,0 @@
-@localstatedir@/log/libvirt/libxl/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-}

diff --git a/daemon/libvirtd.logrotate.in b/daemon/libvirtd.logrotate.in
deleted file mode 100644 (file)
index 4e02510..0000000
--- a/daemon/libvirtd.logrotate.in
+++ /dev/null
@@ -1,9 +0,0 @@
-@localstatedir@/log/libvirt/libvirtd.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-        minsize 100k
-}

diff --git a/daemon/libvirtd.lxc.logrotate.in b/daemon/libvirtd.lxc.logrotate.in
deleted file mode 100644 (file)
index 2bb9dfb..0000000
--- a/daemon/libvirtd.lxc.logrotate.in
+++ /dev/null
@@ -1,8 +0,0 @@
-@localstatedir@/log/libvirt/lxc/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-}

diff --git a/daemon/libvirtd.qemu.logrotate.in b/daemon/libvirtd.qemu.logrotate.in
deleted file mode 100644 (file)
index cdb399e..0000000
--- a/daemon/libvirtd.qemu.logrotate.in
+++ /dev/null
@@ -1,8 +0,0 @@
-@localstatedir@/log/libvirt/qemu/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-}

diff --git a/daemon/libvirtd.uml.logrotate.in b/daemon/libvirtd.uml.logrotate.in
deleted file mode 100644 (file)
index 66a848e..0000000
--- a/daemon/libvirtd.uml.logrotate.in
+++ /dev/null
@@ -1,8 +0,0 @@
-@localstatedir@/log/libvirt/uml/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-}

diff --git a/src/Makefile.am b/src/Makefile.am
index d49c1ba89e2097bb0834acf50347e4a39a7c2fe3..b8e2cbf13901b4d21aa26c42501ad46c9db333e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2853,8 +2853,41 @@ SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%))
 
 EXTRA_DIST += $(SYSVINIT_FILES_IN)
 
+LOGROTATE_FILES_IN = \
+       remote/libvirtd.qemu.logrotate.in \
+       remote/libvirtd.lxc.logrotate.in \
+       remote/libvirtd.libxl.logrotate.in \
+       remote/libvirtd.uml.logrotate.in \
+       remote/libvirtd.logrotate.in \
+       $(NULL)
+
+EXTRA_DIST += $(LOGROTATE_FILES_IN)
+
 if WITH_LIBVIRTD
 
+LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
+
+BUILT_SOURCES += $(LOGROTATE_FILES)
+
+%.logrotate: remote/%.logrotate.in
+       $(AM_V_GEN)sed \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+           < $< > $@-t && \
+       mv $@-t $@
+
+install-logrotate: $(LOGROTATE_FILES)
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/logrotate.d/
+       for f in $(LOGROTATE_FILES) ; \
+       do \
+         tgt=`echo $$f | sed -e 's/.logrotate//'`; \
+         $(INSTALL_DATA) $$f \
+               $(DESTDIR)$(sysconfdir)/logrotate.d/$$tgt; \
+       done
+
+uninstall-logrotate:
+       rm -f $(LOGROTATE_FILES:%.logrotate=$(DESTDIR)$(sysconfdir)/logrotate.d/%)
+       rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
+
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
 # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
@@ -2919,6 +2952,8 @@ install-sysctl::
 uninstall-sysctl::
 install-init::
 uninstall-init::
+install-logrotate::
+uninstall-logrotate::
 endif ! WITH_LIBVIRTD
 
 # This is needed for clients too, so can't wrap in
@@ -3531,8 +3566,10 @@ endif WITH_NSS
 
 
 install-data-local: install-init install-systemd install-upstart \
-               install-sysctl install-polkit install-sasl
+               install-sysctl install-polkit install-sasl \
+               install-logrotate
 if WITH_LIBVIRTD
+       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd"
@@ -3553,6 +3590,7 @@ endif WITH_QEMU
 if WITH_LXC
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
+       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
 endif WITH_LXC
 if WITH_LIBXL
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
@@ -3562,6 +3600,7 @@ endif WITH_LIBXL
 if WITH_UML
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
+       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml"
 endif WITH_UML
 if WITH_XEN
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
@@ -3587,8 +3626,10 @@ if WITH_NETWORK
 endif WITH_NETWORK
 
 uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \
-               uninstall-sysctl uninstall-polkit uninstall-sasl
+               uninstall-sysctl uninstall-polkit uninstall-sasl \
+               uninstall-logrotate
 if WITH_LIBVIRTD
+       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||:
        rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||:
@@ -3609,6 +3650,7 @@ endif WITH_QEMU
 if WITH_LXC
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
        rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
+       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
 endif WITH_LXC
 if WITH_LIBXL
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
@@ -3618,6 +3660,7 @@ endif WITH_LIBXL
 if WITH_UML
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
        rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
+       rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||:
 endif WITH_UML
 if WITH_XEN
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:

diff --git a/src/remote/libvirtd.libxl.logrotate.in b/src/remote/libvirtd.libxl.logrotate.in
new file mode 100644 (file)
index 0000000..cb7f07d
--- /dev/null
+++ b/src/remote/libvirtd.libxl.logrotate.in
@@ -0,0 +1,8 @@
+@localstatedir@/log/libvirt/libxl/*.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+}

diff --git a/src/remote/libvirtd.logrotate.in b/src/remote/libvirtd.logrotate.in
new file mode 100644 (file)
index 0000000..4e02510
--- /dev/null
+++ b/src/remote/libvirtd.logrotate.in
@@ -0,0 +1,9 @@
+@localstatedir@/log/libvirt/libvirtd.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+        minsize 100k
+}

diff --git a/src/remote/libvirtd.lxc.logrotate.in b/src/remote/libvirtd.lxc.logrotate.in
new file mode 100644 (file)
index 0000000..2bb9dfb
--- /dev/null
+++ b/src/remote/libvirtd.lxc.logrotate.in
@@ -0,0 +1,8 @@
+@localstatedir@/log/libvirt/lxc/*.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+}

diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in
new file mode 100644 (file)
index 0000000..cdb399e
--- /dev/null
+++ b/src/remote/libvirtd.qemu.logrotate.in
@@ -0,0 +1,8 @@
+@localstatedir@/log/libvirt/qemu/*.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+}

diff --git a/src/remote/libvirtd.uml.logrotate.in b/src/remote/libvirtd.uml.logrotate.in
new file mode 100644 (file)
index 0000000..66a848e
--- /dev/null
+++ b/src/remote/libvirtd.uml.logrotate.in
@@ -0,0 +1,8 @@
+@localstatedir@/log/libvirt/uml/*.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+}