scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-11-02 02:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged master and fixed conflicts

Browse Source
This commit is contained in:
Ionut Filip
2019-08-21 20:35:24 +03:00
parent 0ce0b5ec02 13d6cf2fdb
commit 075417bf90
175 changed files with 3246 additions and 3719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/nginx/config.py
View File

@@ -3,7 +3,7 @@
import os
import logging as log
import sys
from mailustart import resolve, convert
from socrate import system, conf
args = os.environ.copy()
@@ -14,14 +14,14 @@ with open("/etc/resolv.conf") as handle:
content = handle.read().split()
args["RESOLVER"] = content[content.index("nameserver") + 1]
args["ADMIN_ADDRESS"] = resolve(args.get("HOST_ADMIN", "admin"))
args["ANTISPAM_ADDRESS"] = resolve(args.get("HOST_ANTISPAM", "antispam:11334"))
args["ADMIN_ADDRESS"] = system.resolve_address(args.get("HOST_ADMIN", "admin"))
args["ANTISPAM_ADDRESS"] = system.resolve_address(args.get("HOST_ANTISPAM", "antispam:11334"))
args["HOST_WEBMAIL"] = args.get("HOST_WEBMAIL", "webmail")
if args["WEBMAIL"] != "none":
args["WEBMAIL_ADDRESS"] = resolve(args.get("HOST_WEBMAIL"))
args["WEBMAIL_ADDRESS"] = system.resolve_address(args.get("HOST_WEBMAIL"))
args["HOST_WEBDAV"] = args.get("HOST_WEBDAV", "webdav:5232")
if args["WEBDAV"] != "none":
args["WEBDAV_ADDRESS"] = resolve(args.get("HOST_WEBDAV"))
args["WEBDAV_ADDRESS"] = system.resolve_address(args.get("HOST_WEBDAV"))
# TLS configuration
cert_name = os.getenv("TLS_CERT_FILENAME", default="cert.pem")
@@ -41,8 +41,8 @@ if args["TLS"] and not all(os.path.exists(file_path) for file_path in args["TLS"
args["TLS_ERROR"] = "yes"
# Build final configuration paths
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)
conf.jinja("/conf/tls.conf", args, "/etc/nginx/tls.conf")
conf.jinja("/conf/proxy.conf", args, "/etc/nginx/proxy.conf")
conf.jinja("/conf/nginx.conf", args, "/etc/nginx/nginx.conf")
if os.path.exists("/var/run/nginx.pid"):
os.system("nginx -s reload")