Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2023-05-09 05:29:56 +00:00 committed by Stepan Oksanichenko
commit 4a00f07273
2 changed files with 9 additions and 4 deletions

View File

@ -1,4 +1,5 @@
/var/log/nginx/*log { /var/log/nginx/*.log {
create 0640 nginx root
daily daily
rotate 10 rotate 10
missingok missingok

View File

@ -41,7 +41,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.20.1 Version: 1.20.1
Release: 13%{?dist}.alma Release: 14%{?dist}.alma
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
# BSD License (two clause) # BSD License (two clause)
@ -549,7 +549,9 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx %config(noreplace) %{_sysconfdir}/logrotate.d/nginx
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx %attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp %attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
%dir %{_localstatedir}/log/nginx %attr(711,root,root) %dir %{_localstatedir}/log/nginx
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/access.log
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/error.log
%dir %{nginx_moduledir} %dir %{nginx_moduledir}
%dir %{nginx_moduleconfdir} %dir %{nginx_moduleconfdir}
@ -600,9 +602,11 @@ fi
%changelog %changelog
* Tue Nov 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.20.1-13.alma * Tue May 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.20.1-14.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Thu Nov 24 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-14
- Resolves: #2086527 - Fix logrotate config and nginx log dir permissions
* Wed Jun 22 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-13 * Wed Jun 22 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-13
- Resolves: #2099752 - nginx minimisation for ubi-micro - Resolves: #2099752 - nginx minimisation for ubi-micro
* Tue Jun 21 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-11 * Tue Jun 21 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-11