Fix logrotate postrotate command

Change-Id: I86cfc57953ed9748875b6e23a924b73384e0ea38
Closes-Bug: #1656834

diff --git a/cobbler.spec b/cobbler.spec
index 93f731a45d4b1ee82817100cd6db4e913bdf7519..e616292e1f2f0b556903651e9fa6e81002ad80ad 100644 (file)
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -16,8 +16,9 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.6.9
-Release: 1%{?dist}~mos12
+Release: 1%{?dist}~mos13
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1: cobblerd.logrotate
 # Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
 Patch0: cobbler-virtinstall.patch
 # Support centos release numbering
@@ -112,7 +113,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobbler.conf
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+%if 0%{?rhel} < 7
 mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd_rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
+%else
+mv %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
+%endif
 
 # Create data directories in tftp_dir
 mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}

diff --git a/cobblerd.logrotate b/cobblerd.logrotate
new file mode 100644 (file)
index 0000000..453bcc1
--- /dev/null
+++ b/cobblerd.logrotate
@@ -0,0 +1,26 @@
+/var/log/cobbler/cobbler.log {
+   missingok
+   notifempty
+   rotate 4
+   weekly
+   postrotate
+      systemctl try-restart cobblerd
+   endscript
+}
+
+/var/log/cobbler/tasks/*.log {
+   weekly
+   rotate 0
+   missingok
+   ifempty
+   nocompress
+   nocreate
+   nomail
+}
+
+/var/log/cobbler/install.log {
+   missingok
+   notifempty
+   rotate 4
+   weekly
+}