docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the path of the nginx pid in startup scripts, fixes #483

Browse Source 
(cherry picked from commit 6828231c28)
This commit is contained in:
Pierre Jaury
2018-06-02 10:23:33 +02:00
parent e17c587b78
commit 6a3236200d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/nginx/config.py
View File

@@ -31,5 +31,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")

4
core/nginx/start.py
View File

@@ -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")
# Actual startup script
if not os.path.exists("/certs/dhparam.pem") and os.environ["TLS_FLAVOR"] != "notls":