Fixed logging initialization and rotation on SLES11/12.
diff --git a/rpm/SOURCES/nginx.suse.logrotate b/rpm/SOURCES/nginx.suse.logrotate new file mode 100644 index 0000000..76737fe --- /dev/null +++ b/rpm/SOURCES/nginx.suse.logrotate
@@ -0,0 +1,13 @@ +/var/log/nginx/*.log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx trusted + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +}
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec index 9686b68..2a240d1 100644 --- a/rpm/SPECS/nginx.spec +++ b/rpm/SPECS/nginx.spec
@@ -2,6 +2,7 @@ %define nginx_home %{_localstatedir}/cache/nginx %define nginx_user nginx %define nginx_group nginx +%define nginx_loggroup adm # distribution specific definitions %define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} == 1315) @@ -40,6 +41,7 @@ Group: Productivity/Networking/Web/Servers BuildRequires: libopenssl-devel Requires(pre): pwdutils +%define nginx_loggroup trusted %endif %if 0%{?suse_version} == 1315 @@ -49,6 +51,7 @@ Requires(pre): shadow Requires: systemd %define with_spdy 1 +%define nginx_loggroup trusted %endif # end of distribution specific definitions @@ -70,6 +73,7 @@ Source7: nginx.suse.init Source8: nginx.service Source9: nginx.upgrade.sh +Source10: nginx.suse.logrotate License: 2-clause BSD-like license @@ -219,8 +223,14 @@ # install log rotation stuff %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +%if 0%{?suse_version} +%{__install} -m 644 -p %{SOURCE10} \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/nginx +%else %{__install} -m 644 -p %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/nginx +%endif + %{__install} -m644 %{_builddir}/%{name}-%{version}/objs/nginx.debug \ $RPM_BUILD_ROOT%{_sbindir}/nginx.debug @@ -303,13 +313,13 @@ if [ ! -e %{_localstatedir}/log/nginx/access.log ]; then touch %{_localstatedir}/log/nginx/access.log %{__chmod} 640 %{_localstatedir}/log/nginx/access.log - %{__chown} nginx:adm %{_localstatedir}/log/nginx/access.log + %{__chown} nginx:%{nginx_loggroup} %{_localstatedir}/log/nginx/access.log fi if [ ! -e %{_localstatedir}/log/nginx/error.log ]; then touch %{_localstatedir}/log/nginx/error.log %{__chmod} 640 %{_localstatedir}/log/nginx/error.log - %{__chown} nginx:adm %{_localstatedir}/log/nginx/error.log + %{__chown} nginx:%{nginx_loggroup} %{_localstatedir}/log/nginx/error.log fi fi fi