From c6095cd72e5a0c60a837214e5408feb42baf939d Mon Sep 17 00:00:00 2001 From: ofthesun9 Date: Sat, 2 Jun 2018 07:03:16 +0200 Subject: [PATCH 1/2] Update config.py replace /var/log/nginx.pid with /var/run/nginx.pid to ensure consistency with core/nginx/conf/nginx.conf --- core/nginx/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") From 9de58279a526cba01d810a0221e9e78b47e9714d Mon Sep 17 00:00:00 2001 From: ofthesun9 Date: Sat, 2 Jun 2018 07:04:14 +0200 Subject: [PATCH 2/2] Update start.py replace /var/log/nginx.pid with /var/run/nginx.pid to ensure consistency with core/nginx/conf/nginx.conf --- core/nginx/start.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"])