matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #11052 from opensourcerouting/fix/log_dir_permissions

Browse source 
packaging: A couple of fixes for /var/log/frr
This commit is contained in:
Donald Sharp 2022-04-20 07:45:08 -04:00 committed by GitHub
parent 831a15d3e3 b5b09eee6d
commit 83bbdb5e14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/frr.logrotate vendored
View file

@ -4,7 +4,7 @@
missingok missingok
compress compress
rotate 14 rotate 14
create 640 frr frrvty create 0640 frr frr
postrotate postrotate
pid=$(lsof -t -a -c /syslog/ /var/log/frr/* 2>/dev/null) pid=$(lsof -t -a -c /syslog/ /var/log/frr/* 2>/dev/null)

2
debian/frr.postinst vendored
View file

@ -16,7 +16,7 @@ adduser \
frr frr
usermod -a -G frrvty frr usermod -a -G frrvty frr
mkdir -p /var/log/frr mkdir -m 0755 -p /var/log/frr
mkdir -p /etc/frr mkdir -p /etc/frr

7
redhat/frr.spec.in
View file

@ -432,7 +432,8 @@ popd
%install %install
mkdir -p %{buildroot}%{_sysconfdir}/{frr,sysconfig,logrotate.d,pam.d,default} \ mkdir -p %{buildroot}%{_sysconfdir}/{frr,sysconfig,logrotate.d,pam.d,default} \
%{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} %{buildroot}%{_infodir}
mkdir -m 0755 -p %{buildroot}%{_localstatedir}/log/frr
make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install
# Remove this file, as it is uninstalled and causes errors when building on RH9 # Remove this file, as it is uninstalled and causes errors when building on RH9
@ -639,11 +640,11 @@ fi
/usr/share/yang/*.yang /usr/share/yang/*.yang
%if 0%{?frr_user:1} %if 0%{?frr_user:1}
%dir %attr(751,%{frr_user},%{frr_user}) %{configdir} %dir %attr(751,%{frr_user},%{frr_user}) %{configdir}
%dir %attr(750,%{frr_user},%{frr_user}) %{_localstatedir}/log/frr %dir %attr(755,%{frr_user},%{frr_user}) %{_localstatedir}/log/frr
%dir %attr(751,%{frr_user},%{frr_user}) %{rundir} %dir %attr(751,%{frr_user},%{frr_user}) %{rundir}
%else %else
%dir %attr(750,root,root) %{configdir} %dir %attr(750,root,root) %{configdir}
%dir %attr(750,root,root) %{_localstatedir}/log/frr %dir %attr(755,root,root) %{_localstatedir}/log/frr
%dir %attr(750,root,root) %{rundir} %dir %attr(750,root,root) %{rundir}
%endif %endif
%{_infodir}/frr.info.gz %{_infodir}/frr.info.gz

2
tools/frr-reload.py
View file

@ -1752,7 +1752,7 @@ if __name__ == "__main__":
elif args.reload: elif args.reload:
if not os.path.isdir("/var/log/frr/"): if not os.path.isdir("/var/log/frr/"):
os.makedirs("/var/log/frr/") os.makedirs("/var/log/frr/", mode=0o0755)
logging.basicConfig( logging.basicConfig(
filename="/var/log/frr/frr-reload.log", filename="/var/log/frr/frr-reload.log",