Skip to content

Commit

Permalink
packaging: Reuse frr.logrotate for Debian and Redhat builds
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ton31337 committed Nov 8, 2022
1 parent 473f991 commit c4831d2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ EXTRA_DIST += \
\
python/xrefstructs.json \
\
redhat/frr.logrotate \
tools/etc/logrotate.d/frr \
redhat/frr.pam \
redhat/frr.spec \
\
Expand Down
1 change: 1 addition & 0 deletions debian/frr.install
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion redhat/frr.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit c4831d2

Please sign in to comment.