From 6828231c2833cca6e6fc3ef7e2c70af0570cfd2b Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sat, 2 Jun 2018 10:23:33 +0200 Subject: [PATCH] Fix the path of the nginx pid in startup scripts, fixes #483 --- core/nginx/config.py | 2 +- core/nginx/start.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/nginx/config.py b/core/nginx/config.py index d4b29fb1..33071d01 100755 --- a/core/nginx/config.py +++ b/core/nginx/config.py @@ -42,5 +42,5 @@ if args["TLS"] and not all(os.path.exists(file_path) for file_path in args["TLS" convert("/conf/tls.conf", "/etc/nginx/tls.conf", args) convert("/conf/proxy.conf", "/etc/nginx/proxy.conf", args) convert("/conf/nginx.conf", "/etc/nginx/nginx.conf", args) -if os.path.exists("/var/log/nginx.pid"): +if os.path.exists("/var/run/nginx.pid"): os.system("nginx -s reload") diff --git a/core/nginx/start.py b/core/nginx/start.py index bd5ce20c..b63b64a2 100755 --- a/core/nginx/start.py +++ b/core/nginx/start.py @@ -4,8 +4,8 @@ import os import subprocess # Check if a stale pid file exists -if os.path.exists("/var/log/nginx.pid"): - os.remove("/var/log/nginx.pid") +if os.path.exists("/var/run/nginx.pid"): + os.remove("/var/run/nginx.pid") if os.environ["TLS_FLAVOR"] in [ "letsencrypt","mail-letsencrypt" ]: subprocess.Popen(["/letsencrypt.py"])