scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-29 09:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary host variable assignments

Browse Source 
(cherry picked from commit 4afbc09d6e)

# Conflicts:
#	core/nginx/config.py
This commit is contained in:
kaiyou
2019-08-22 22:44:49 +02:00
committed by Mergify
parent 6b5bb5fcd1
commit c89c3fc2fa
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/nginx/config.py
View File

@@ -67,8 +67,19 @@ args['TLS_PERMISSIVE'] = str(args.get('TLS_PERMISSIVE')).lower() not in ('false'
# Get the first DNS server # Get the first DNS server
with open("/etc/resolv.conf") as handle: with open("/etc/resolv.conf") as handle:
content = handle.read().split() content = handle.read().split()
<<<<<<< HEAD
resolver = content[content.index("nameserver") + 1] resolver = content[content.index("nameserver") + 1]
args["RESOLVER"] = f"[{resolver}]" if ":" in resolver else resolver args["RESOLVER"] = f"[{resolver}]" if ":" in resolver else resolver
=======
args["RESOLVER"] = content[content.index("nameserver") + 1]
args["ADMIN_ADDRESS"] = system.resolve_address(args.get("HOST_ADMIN", "admin"))
args["ANTISPAM_ADDRESS"] = system.resolve_address(args.get("HOST_ANTISPAM", "antispam:11334"))
if args["WEBMAIL"] != "none":
args["WEBMAIL_ADDRESS"] = system.resolve_address(args.get("HOST_WEBMAIL", "webmail"))
if args["WEBDAV"] != "none":
args["WEBDAV_ADDRESS"] = system.resolve_address(args.get("HOST_WEBDAV", "webdav:5232"))
>>>>>>> 4afbc09d (Remove unnecessary host variable assignments)
# TLS configuration # TLS configuration
cert_name = args.get("TLS_CERT_FILENAME", "cert.pem") cert_name = args.get("TLS_CERT_FILENAME", "cert.pem")