From 0643ec846f6c9cbaf1baed36558af5c50cef4943ad3e57ec2e4a58e6c38c71b6 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 2 Jun 2016 11:56:21 +0000 Subject: [PATCH] - in the sysvinit script use the pid file in /var/run OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=65 --- nginx.changes | 5 +++++ nginx.init | 2 +- nginx.spec | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nginx.changes b/nginx.changes index f97252c..2ed14ad 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 2 11:55:19 UTC 2016 - mrueckert@suse.de + +- in the sysvinit script use the pid file in /var/run + ------------------------------------------------------------------- Wed Jun 1 12:33:55 UTC 2016 - mrueckert@suse.de diff --git a/nginx.init b/nginx.init index b2f13cf..e788194 100644 --- a/nginx.init +++ b/nginx.init @@ -115,7 +115,7 @@ NGINX_BIN=/usr/sbin/nginx test -x $NGINX_BIN || { echo "$NGINX_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } -NGINX_PID=/run/nginx.pid +NGINX_PID=/var/run/nginx.pid # Check for existence of needed config file and read it #NGINX_CONFIG=/etc/sysconfig/nginx diff --git a/nginx.spec b/nginx.spec index bf76fb9..a6759ff 100644 --- a/nginx.spec +++ b/nginx.spec @@ -134,6 +134,7 @@ It has been running on many heavily loaded Russian sites for more than two years %patch4 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl +# we just use lib here because nginx loads them relative to _prefix perl -pi -e 's|#LIBDIR#|%{_lib}|g' conf/nginx.conf %if %{with fancyindex}