From 8d08566b431a6b56060877fe945d2c9c3dc8c804 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Thu, 22 Mar 2018 21:48:13 +0100 Subject: [PATCH] Really reload Nginx --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 064e64363..4560151c0 100644 --- a/Makefile +++ b/Makefile @@ -504,7 +504,11 @@ reload_web_server: LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \ /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \ elif [ -e e2e-tests/conf/nginx.pid ]; then \ - kill -HUP `cat e2e-tests/conf/nginx.pid`; \ + $(NGINX) -p `pwd`/e2e-tests \ + -g 'error_log '`pwd`'/e2e-tests/conf/nginx.log;' \ + -c `pwd`/e2e-tests/nginx.conf \ + -s reload \ + 2>&1 | grep -v 'Permission denied' || true; \ kill `cat e2e-tests/conf/llng-fastcgi.pid` || true; \ $(MAKE) plackup; \ elif [ -e e2e-tests/conf/server.pid ]; then \ -- GitLab