pool/nginx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1167914 from home:13ilya

Browse Source 
- 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
This commit is contained in:
Илья Индиго 2024-04-16 06:03:19 +00:00 committed by Git OBS Bridge
parent c8a60a67ca
commit 99174ed9d4
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx.changes
View File

@ -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> Sun Mar 3 10:24:27 UTC 2024 - Adam Mizerski <adam@mizerski.pl>

1
nginx.service
View File

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

5
nginx.spec
View File

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

1
nginx.tmpfiles.d
View File

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