From c20a502695df73798cc8f38f2754e5317e4eb5c8 Mon Sep 17 00:00:00 2001 From: kaiyou Date: Mon, 24 Jun 2019 20:54:50 +0200 Subject: [PATCH] Do not forcefully resolve optional hostnames --- core/admin/mailu/configuration.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index dc290fcc..0c4d0abd 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -73,15 +73,17 @@ class ConfigManager(dict): 'mysql': 'mysql://{DB_USER}:{DB_PW}@{DB_HOST}/{DB_NAME}' } - HOSTS = ('HOST_IMAP', 'HOST_POP3', 'HOST_AUTHSMTP', 'HOST_SMTP', - 'HOST_WEBMAIL') + HOSTS = ('IMAP', 'POP3', 'AUTHSMTP', 'SMTP') + OPTIONAL_HOSTS = ('WEBMAIL', 'ANTISPAM') def __init__(self): self.config = dict() def resolve_host(self): - for item in self.HOSTS: - self.config[item] = system.resolve_address(self.config[item]) + optional = [item for item in self.OPTIONAL_HOSTS if item in self.config] + for item in self.HOSTS + optional: + host = 'HOST_' + item + self.config[host] = system.resolve_address(self.config[host]) def __coerce_value(self, value): if isinstance(value, str) and value.lower() in ('true','yes'):