Accepting request 1167914 from home:13ilya

- Set RuntimeDirectory to offer a location for Unix sockets at /run/nginx

OBS-URL: https://build.opensuse.org/request/show/1167914
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=257

nginx.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Mon Apr 15 18:28:09 UTC 2024 - Илья Индиго <13ilya@gmail.com>
+Tue Apr 16 05:52:58 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
 
-- Added file nginx.tmpfiles.d for creation run-time directory.
+- Set RuntimeDirectory to offer a location for Unix sockets at /run/nginx
 
 -------------------------------------------------------------------
 Sun Mar  3 10:24:27 UTC 2024 - Adam Mizerski <adam@mizerski.pl>

nginx.service

@@ -4,6 +4,7 @@ After=network-online.target remote-fs.target nss-lookup.target
 Wants=network-online.target
 
 [Service]
+RuntimeDirectory=nginx
 PIDFile=/run/nginx.pid
 ExecStartPre=/usr/sbin/nginx -t
 ExecStart=/usr/sbin/nginx -g "daemon off;"

nginx.spec

@@ -36,7 +36,6 @@ Source3:        %{name}.rpmlintrc
 Source4:        %{name}.logrotate
 Source5:        %{name}.service
 Source6:        %{name}.sysusers
-Source7:        %{name}.tmpfiles.d
 # PATCH-FIX-UPSTREAM nginx-1.11.2-no_Werror.patch
 Patch0:         %{name}-1.11.2-no_Werror.patch
 # PATCH-FIX-OPENSUSE nginx-1.11.2-html.patch
@@ -130,7 +129,6 @@ install -dpm0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi}
 install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -Dpm0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service
 install -Dpm0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/%{name}.conf
-install -Dpm0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
 rm %{buildroot}/srv/www/htdocs/index.html
@@ -167,7 +165,6 @@ copydocs() {
 
 %post
 %service_add_post %{name}.service
-%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
 
 %postun
 %service_del_postun %{name}.service
@@ -216,8 +213,6 @@ copydocs() {
 %{_unitdir}/%{name}.service
 %{_sysusersdir}/%{name}.conf
 %{_datadir}/%{name}/
-%{_tmpfilesdir}/%{name}.conf
-%ghost %dir /run/%{name}
 
 %files source
 %{src_install_dir}

nginx.tmpfiles.d

@@ -1 +0,0 @@
-d /run/nginx 0755 nginx nginx -