From c8a60a67ca60c1ef9bbc7a62fb84306cd705779cee14a45fc33e73561d50f2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Mon, 15 Apr 2024 18:37:48 +0000 Subject: [PATCH 1/2] Accepting request 1167864 from home:13ilya - Added file nginx.tmpfiles.d for creation run-time directory. OBS-URL: https://build.opensuse.org/request/show/1167864 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=256 --- nginx.changes | 5 +++++ nginx.spec | 5 +++++ nginx.tmpfiles.d | 1 + 3 files changed, 11 insertions(+) create mode 100644 nginx.tmpfiles.d diff --git a/nginx.changes b/nginx.changes index 69b1088..600b4e4 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 15 18:28:09 UTC 2024 - Илья Индиго <13ilya@gmail.com> + +- Added file nginx.tmpfiles.d for creation run-time directory. + ------------------------------------------------------------------- Sun Mar 3 10:24:27 UTC 2024 - Adam Mizerski diff --git a/nginx.spec b/nginx.spec index 5d62ae2..88c3f9a 100644 --- a/nginx.spec +++ b/nginx.spec @@ -36,6 +36,7 @@ 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 @@ -129,6 +130,7 @@ 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 @@ -165,6 +167,7 @@ copydocs() { %post %service_add_post %{name}.service +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %postun %service_del_postun %{name}.service @@ -213,6 +216,8 @@ copydocs() { %{_unitdir}/%{name}.service %{_sysusersdir}/%{name}.conf %{_datadir}/%{name}/ +%{_tmpfilesdir}/%{name}.conf +%ghost %dir /run/%{name} %files source %{src_install_dir} diff --git a/nginx.tmpfiles.d b/nginx.tmpfiles.d new file mode 100644 index 0000000..81aa918 --- /dev/null +++ b/nginx.tmpfiles.d @@ -0,0 +1 @@ +d /run/nginx 0755 nginx nginx - From 99174ed9d4c6bbc2189882046b3e6883e57bf14ce4cf398b743f0d9e11c9e74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Tue, 16 Apr 2024 06:03:19 +0000 Subject: [PATCH 2/2] 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 | 4 ++-- nginx.service | 1 + nginx.spec | 5 ----- nginx.tmpfiles.d | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 nginx.tmpfiles.d diff --git a/nginx.changes b/nginx.changes index 600b4e4..cc3c328 100644 --- a/nginx.changes +++ b/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 -- 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 diff --git a/nginx.service b/nginx.service index a9b409e..2516000 100644 --- a/nginx.service +++ b/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;" diff --git a/nginx.spec b/nginx.spec index 88c3f9a..5d62ae2 100644 --- a/nginx.spec +++ b/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} diff --git a/nginx.tmpfiles.d b/nginx.tmpfiles.d deleted file mode 100644 index 81aa918..0000000 --- a/nginx.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/nginx 0755 nginx nginx -