diff --git a/Makefile b/Makefile index ca160a9c..1a36a410 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ install: build docs install -d -m 0755 $(DESTDIR)$(MANDIR)/man5 install -d -m 0755 $(DESTDIR)$(WWDOCDIR) install -d -m 0755 $(DESTDIR)$(FIREWALLDDIR) + install -d -m 0755 $(DESTDIR)$(LOGROTATEDIR) install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR) install -d -m 0755 $(DESTDIR)$(IPXESOURCE) install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf @@ -120,7 +121,7 @@ install: build docs for f in etc/ipxe/*.ipxe; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/ipxe/; done install -m 0644 etc/grub/grub.cfg.ww $(DESTDIR)$(WWCONFIGDIR)/grub/grub.cfg.ww install -m 0644 etc/grub/chainload.ww $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs$(TFTPDIR)/warewulf/grub.cfg.ww - install -m 0644 etc/logrotate.d/logrotate.conf $(DESTDIR)$(WWCONFIGDIR)/logrotate.d/logrotate.conf + install -m 0644 etc/logrotate.d/warewulfd.conf $(DESTDIR)$(LOGROTATEDIR)/warewulfd.conf (cd overlays && find * -type f -exec install -D -m 0644 {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;) (cd overlays && find * -type d -exec mkdir -pv $(DESTDIR)$(WWOVERLAYDIR)/{} \;) (cd overlays && find * -type l -exec cp -av {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;) diff --git a/Variables.mk b/Variables.mk index b23f6a11..69f39507 100644 --- a/Variables.mk +++ b/Variables.mk @@ -48,6 +48,7 @@ VARLIST += TFTPDIR FIREWALLDDIR SYSTEMDDIR BASHCOMPDIR DRACUTMODDIR SYSTEMDDIR ?= /usr/lib/systemd/system BASHCOMPDIR ?= /etc/bash_completion.d FIREWALLDDIR ?= /usr/lib/firewalld/services +LOGROTATEDIR ?= /etc/logrotate.d DRACUTMODDIR ?= /usr/lib/dracut/modules.d ifeq ($(OS),suse) TFTPDIR ?= /srv/tftpboot diff --git a/warewulf.spec.in b/warewulf.spec.in index ed1a4251..0d61f47b 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -78,6 +78,8 @@ BuildRequires: make BuildRequires: libassuan-devel gpgme-devel %endif +Recommends: logrotate + %description Warewulf is a stateless and diskless container operating system provisioning system for large clusters of bare metal and/or virtual systems. @@ -169,18 +171,22 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %files +%dir %{_sysconfdir}/bash_completion.d +%dir %{_sysconfdir}/logrotate.d + %defattr(-, root, %{wwgroup}) %dir %{_sysconfdir}/warewulf %config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf %config(noreplace) %{_sysconfdir}/warewulf/examples %config(noreplace) %{_sysconfdir}/warewulf/ipxe %config(noreplace) %{_sysconfdir}/warewulf/grub -%config(noreplace) %{_sysconfdir}/logrotate.d/warewulf.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/warewulfd.conf %config(noreplace) %attr(0640,-,-) %{_sysconfdir}/warewulf/nodes.conf + %{_sysconfdir}/bash_completion.d/wwctl %dir %{_sharedstatedir}/warewulf -%{_sharedstatedir}/warewulf/chroots +%dir %{_sharedstatedir}/warewulf/chroots %dir %{_sharedstatedir}/warewulf/overlays %dir %{_sharedstatedir}/warewulf/overlays/debug %dir %{_sharedstatedir}/warewulf/overlays/generic