From c4831d286498c6505a389af089abd9c1850e09ba Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Wed, 20 Apr 2022 09:48:28 +0300 Subject: 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 --- debian/frr.install | 1 + debian/frr.logrotate | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 debian/frr.logrotate (limited to 'debian') 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/debian/frr.logrotate b/debian/frr.logrotate deleted file mode 100644 index 735af6539b..0000000000 --- a/debian/frr.logrotate +++ /dev/null @@ -1,27 +0,0 @@ -/var/log/frr/*.log { - size 500k - sharedscripts - missingok - compress - rotate 14 - create 0640 frr frr - - postrotate - pid=$(lsof -t -a -c /syslog/ /var/log/frr/* 2>/dev/null) - if [ -n "$pid" ] - then # using syslog - kill -HUP $pid - fi - # in case using file logging; if switching back and forth - # between file and syslog, rsyslogd might still have file - # open, as well as the daemons, so always signal the daemons. - # It's safe, a NOP if (only) syslog is being used. - for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd sharpd \ - pimd pim6d ripd ripngd zebra pathd pbrd staticd bfdd fabricd vrrpd; do - if [ -e /var/run/frr/$i.pid ] ; then - pids="$pids $(cat /var/run/frr/$i.pid)" - fi - done - [ -n "$pids" ] && kill -USR1 $pids || true - endscript -} -- cgit v1.2.3