From c4831d286498c6505a389af089abd9c1850e09ba Mon Sep 17 00:00:00 2001
From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Wed, 20 Apr 2022 09:48:28 +0300
Subject: [PATCH] packaging: Reuse frr.logrotate for Debian and Redhat builds

It will be easier to maintain a single file instead of two separate.

Also, fixes the issue when the file (/var/log/frr/frr.log) is not created
after logrotate.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---
 Makefile.am                                       | 2 +-
 debian/frr.install                                | 1 +
 redhat/frr.spec.in                                | 2 +-
 debian/frr.logrotate => tools/etc/logrotate.d/frr | 0
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename debian/frr.logrotate => tools/etc/logrotate.d/frr (100%)

diff --git a/Makefile.am b/Makefile.am
index 8c7bde9d4c..44d2ab8e72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ EXTRA_DIST += \
 	\
 	python/xrefstructs.json \
 	\
-	redhat/frr.logrotate \
+	tools/etc/logrotate.d/frr \
 	redhat/frr.pam \
 	redhat/frr.spec \
 	\
diff --git a/debian/frr.install b/debian/frr.install
index 48263222f8..044b484984 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -1,6 +1,7 @@
 debian/frr.conf usr/lib/tmpfiles.d
 etc/
 tools/etc/frr/frr.conf etc/frr/
+tools/etc/logrotate.d/frr etc/logrotate.d/
 tools/frr-reload usr/lib/frr/
 usr/bin/mtracebis
 usr/bin/vtysh
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 8f469d2a07..afe75e1f26 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -469,7 +469,7 @@ ln -s %{_sbindir}/frrinit.sh %{buildroot}%{_initddir}/frr
 install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr
 install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr/frr.conf.template
 install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
-install -m644 %{zeb_rh_src}/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr
+install -m644 %{zeb_src}/tools/etc/logrotate.d/frr %{buildroot}%{_sysconfdir}/logrotate.d/frr
 install -d -m750 %{buildroot}%{rundir}
 
 %if 0%{?rhel} > 7 || 0%{?fedora} > 29
diff --git a/debian/frr.logrotate b/tools/etc/logrotate.d/frr
similarity index 100%
rename from debian/frr.logrotate
rename to tools/etc/logrotate.d/frr