- 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
This commit is contained in:
Marcus Rückert 2016-06-02 11:56:21 +00:00 committed by Git OBS Bridge
parent 19316524bd
commit 0643ec846f
3 changed files with 7 additions and 1 deletions

View File

@ -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 Wed Jun 1 12:33:55 UTC 2016 - mrueckert@suse.de

View File

@ -115,7 +115,7 @@ NGINX_BIN=/usr/sbin/nginx
test -x $NGINX_BIN || { echo "$NGINX_BIN not installed"; test -x $NGINX_BIN || { echo "$NGINX_BIN not installed";
if [ "$1" = "stop" ]; then exit 0; if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; } 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 # Check for existence of needed config file and read it
#NGINX_CONFIG=/etc/sysconfig/nginx #NGINX_CONFIG=/etc/sysconfig/nginx

View File

@ -134,6 +134,7 @@ It has been running on many heavily loaded Russian sites for more than two years
%patch4 -p1 %patch4 -p1
perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl 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 perl -pi -e 's|#LIBDIR#|%{_lib}|g' conf/nginx.conf
%if %{with fancyindex} %if %{with fancyindex}