From ec4b35673af9f552f2692d152912bf1801f8aa01 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 14:06:48 +0200 Subject: [PATCH 01/11] Resolve HOST_REDIS in rspamd --- services/rspamd/start.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/rspamd/start.py b/services/rspamd/start.py index 3febed2b..c98f90f8 100755 --- a/services/rspamd/start.py +++ b/services/rspamd/start.py @@ -10,8 +10,7 @@ log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING")) # Actual startup script os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) - -if "HOST_REDIS" not in os.environ: os.environ["HOST_REDIS"] = "redis" +os.environ["HOST_REDIS"] = resolve(os.environ.get("HOST_REDIS", "redis")) for rspamd_file in glob.glob("/conf/*"): convert(rspamd_file, os.path.join("/etc/rspamd/local.d", os.path.basename(rspamd_file))) From 43abbf4d636dce9dbe1f4b47a9092b8ceab3def5 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 15:37:55 +0200 Subject: [PATCH 02/11] Resolve redis and add logging --- core/admin/mailu/configuration.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 84fbbdde..95cc8412 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -1,5 +1,7 @@ import os from mailustart import resolve +import logging as log +import sys DEFAULT_CONFIG = { # Specific to the admin UI @@ -50,12 +52,14 @@ DEFAULT_CONFIG = { 'RECAPTCHA_PRIVATE_KEY': '', # Advanced settings 'PASSWORD_SCHEME': 'BLF-CRYPT', + 'LOG_LEVEL': 'WARNING', # Host settings 'HOST_IMAP': 'imap', 'HOST_POP3': 'imap', 'HOST_SMTP': 'smtp', 'HOST_WEBMAIL': 'webmail', 'HOST_FRONT': 'front', + 'HOST_REDIS': 'redis', 'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'), 'SUBNET': '192.168.203.0/24', 'POD_ADDRESS_RANGE': None @@ -79,6 +83,7 @@ class ConfigManager(dict): self.config['HOST_POP3'] = resolve(self.config['HOST_POP3']) self.config['HOST_AUTHSMTP'] = resolve(self.config['HOST_AUTHSMTP']) self.config['HOST_SMTP'] = resolve(self.config['HOST_SMTP']) + self.config['HOST_REDIS'] = resolve(self.config['HOST_REDIS']) def __coerce_value(self, value): if isinstance(value, str) and value.lower() in ('true','yes'): @@ -94,6 +99,7 @@ class ConfigManager(dict): key: self.__coerce_value(os.environ.get(key, value)) for key, value in DEFAULT_CONFIG.items() }) + log.basicConfig(stream=sys.stderr, level=self.config["LOG_LEVEL"]) self.resolve_host() # automatically set the sqlalchemy string From ef49357eb3956d51df97843e9315e13b05cea593 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 16:07:23 +0200 Subject: [PATCH 03/11] Update redis urls --- core/admin/mailu/configuration.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 95cc8412..2e0ed489 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -9,8 +9,8 @@ DEFAULT_CONFIG = { 'BABEL_DEFAULT_LOCALE': 'en', 'BABEL_DEFAULT_TIMEZONE': 'UTC', 'BOOTSTRAP_SERVE_LOCAL': True, - 'RATELIMIT_STORAGE_URL': 'redis://redis/2', - 'QUOTA_STORAGE_URL': 'redis://redis/1', + 'RATELIMIT_STORAGE_URL': '', + 'QUOTA_STORAGE_URL': '', 'DEBUG': False, 'DOMAIN_REGISTRATION': False, 'TEMPLATES_AUTO_RELOAD': True, @@ -106,6 +106,9 @@ class ConfigManager(dict): if self.config['DB_FLAVOR']: template = self.DB_TEMPLATES[self.config['DB_FLAVOR']] self.config['SQLALCHEMY_DATABASE_URI'] = template.format(**self.config) + + self.config['RATELIMIT_STORAGE_URL'] = 'redis://{0}/2'.format(self.config['HOST_REDIS']) + self.config['QUOTA_STORAGE_URL'] = 'redis://{0}/1'.format(self.config['HOST_REDIS']) # update the app config itself app.config = self From 71d63c6e45e67de21dab514f5b1937a0f1358fee Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 16:20:55 +0200 Subject: [PATCH 04/11] Fix redis resolve in imap --- core/dovecot/start.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dovecot/start.py b/core/dovecot/start.py index 53999bd6..e25d9c5d 100755 --- a/core/dovecot/start.py +++ b/core/dovecot/start.py @@ -22,7 +22,7 @@ def start_podop(): # Actual startup script os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) -os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("REDIS_ADDRESS", "redis")) +os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("HOST_REDIS", "redis")) os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin")) if os.environ["WEBMAIL"] != "none": os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("WEBMAIL_ADDRESS", "webmail")) From f9e3cd3c5d72fc618815b7e1255dd36d1f69ea0d Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 16:49:56 +0200 Subject: [PATCH 05/11] Use corret host_* variables --- core/admin/mailu/configuration.py | 8 ++++++-- core/dovecot/start.py | 6 +++--- core/postfix/start.py | 4 ++-- services/rspamd/start.py | 2 +- webmails/rainloop/start.py | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 2e0ed489..f7040788 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -55,12 +55,16 @@ DEFAULT_CONFIG = { 'LOG_LEVEL': 'WARNING', # Host settings 'HOST_IMAP': 'imap', + 'HOST_LMTP': 'imap:2525', 'HOST_POP3': 'imap', 'HOST_SMTP': 'smtp', + 'HOST_AUTHSMTP': 'smtp', + 'HOST_ADMIN': 'admin', + 'HOST_ANTISPAM': 'antispam:11334', 'HOST_WEBMAIL': 'webmail', - 'HOST_FRONT': 'front', + 'HOST_WEBDAV': 'webdav:5232', 'HOST_REDIS': 'redis', - 'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'), + 'HOST_FRONT': 'front', 'SUBNET': '192.168.203.0/24', 'POD_ADDRESS_RANGE': None } diff --git a/core/dovecot/start.py b/core/dovecot/start.py index e25d9c5d..4816cf9d 100755 --- a/core/dovecot/start.py +++ b/core/dovecot/start.py @@ -21,11 +21,11 @@ def start_podop(): ]) # Actual startup script -os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) +os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("HOST_REDIS", "redis")) -os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin")) +os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin")) if os.environ["WEBMAIL"] != "none": - os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("WEBMAIL_ADDRESS", "webmail")) + os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("HOST_WEBMAIL", "webmail")) for dovecot_file in glob.glob("/conf/*.conf"): convert(dovecot_file, os.path.join("/etc/dovecot", os.path.basename(dovecot_file))) diff --git a/core/postfix/start.py b/core/postfix/start.py index 95c97fde..716b3edb 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -26,8 +26,8 @@ def start_podop(): ]) # Actual startup script -os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) -os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin")) +os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) +os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin")) os.environ["HOST_ANTISPAM"] = resolve(os.environ.get("HOST_ANTISPAM", "antispam:11332")) os.environ["HOST_LMTP"] = resolve(os.environ.get("HOST_LMTP", "imap:2525")) diff --git a/services/rspamd/start.py b/services/rspamd/start.py index c98f90f8..78e2f37d 100755 --- a/services/rspamd/start.py +++ b/services/rspamd/start.py @@ -9,7 +9,7 @@ from mailustart import resolve, convert log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING")) # Actual startup script -os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) +os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) os.environ["HOST_REDIS"] = resolve(os.environ.get("HOST_REDIS", "redis")) for rspamd_file in glob.glob("/conf/*"): diff --git a/webmails/rainloop/start.py b/webmails/rainloop/start.py index 495eb376..f0b18dbd 100755 --- a/webmails/rainloop/start.py +++ b/webmails/rainloop/start.py @@ -9,8 +9,8 @@ from mailustart import resolve, convert log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING")) # Actual startup script -os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front")) -os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("IMAP_ADDRESS", "imap")) +os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) +os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("HOST_IMAP", "imap")) os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT"))*0.66/1048576)) From 7885fb8a41c79afd4dca2c989af4e08a859b04f7 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 17:54:24 +0200 Subject: [PATCH 06/11] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 201f26ef..a9117f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ v1.6.1 - unreleased - Bug: Fix poor performance if ANTIVIRUS is configured to none. - Bug: Rename cli commands and their options (replace "\_" with "-") ([#877](https://github.com/Mailu/Mailu/issues/877)) - Bug: Fix typo in migration script ([#905](https://github.com/Mailu/Mailu/issues/905)) +- BUG: Fix HOST_* variable usage ([#884](https://github.com/Mailu/Mailu/issues/884)) v1.6.0 - 2019-01-18 ------------------- From 4c25c83419be128fb12591721627a718ec23f69d Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Mon, 18 Feb 2019 14:46:48 +0200 Subject: [PATCH 07/11] HOST_* and *_ADDRESS variables cleanup --- core/admin/mailu/configuration.py | 14 +++++++------- core/nginx/conf/nginx.conf | 10 +++++----- core/nginx/config.py | 8 ++++---- core/postfix/conf/main.cf | 4 ++-- core/postfix/start.py | 4 ++-- services/rspamd/conf/history_redis.conf | 2 +- services/rspamd/conf/redis.conf | 2 +- services/rspamd/start.py | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index f7040788..def48930 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -83,11 +83,11 @@ class ConfigManager(dict): self.config = dict() def resolve_host(self): - self.config['HOST_IMAP'] = resolve(self.config['HOST_IMAP']) - self.config['HOST_POP3'] = resolve(self.config['HOST_POP3']) - self.config['HOST_AUTHSMTP'] = resolve(self.config['HOST_AUTHSMTP']) - self.config['HOST_SMTP'] = resolve(self.config['HOST_SMTP']) - self.config['HOST_REDIS'] = resolve(self.config['HOST_REDIS']) + self.config['IMAP_ADDRESS'] = resolve(self.config['HOST_IMAP']) + self.config['POP3_ADDRESS'] = resolve(self.config['HOST_POP3']) + self.config['AUTHSMTP_ADDRESS'] = resolve(self.config['HOST_AUTHSMTP']) + self.config['SMTP_ADDRESS'] = resolve(self.config['HOST_SMTP']) + self.config['REDIS_ADDRESS'] = resolve(self.config['HOST_REDIS']) def __coerce_value(self, value): if isinstance(value, str) and value.lower() in ('true','yes'): @@ -111,8 +111,8 @@ class ConfigManager(dict): template = self.DB_TEMPLATES[self.config['DB_FLAVOR']] self.config['SQLALCHEMY_DATABASE_URI'] = template.format(**self.config) - self.config['RATELIMIT_STORAGE_URL'] = 'redis://{0}/2'.format(self.config['HOST_REDIS']) - self.config['QUOTA_STORAGE_URL'] = 'redis://{0}/1'.format(self.config['HOST_REDIS']) + self.config['RATELIMIT_STORAGE_URL'] = 'redis://{0}/2'.format(self.config['REDIS_ADDRESS']) + self.config['QUOTA_STORAGE_URL'] = 'redis://{0}/1'.format(self.config['REDIS_ADDRESS']) # update the app config itself app.config = self diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf index 7107a351..0e89324a 100644 --- a/core/nginx/conf/nginx.conf +++ b/core/nginx/conf/nginx.conf @@ -41,10 +41,10 @@ http { # Favicon stuff root /static; # Variables for proxifying - set $admin {{ HOST_ADMIN }}; - set $antispam {{ HOST_ANTISPAM }}; - set $webmail {{ HOST_WEBMAIL }}; - set $webdav {{ HOST_WEBDAV }}; + set $admin {{ ADMIN_ADDRESS }}; + set $antispam {{ ANTISPAM_ADDRESS }}; + set $webmail {{ WEBMAIL_ADDRESS }}; + set $webdav {{ WEBDAV_ADDRESS }}; # Always listen over HTTP listen 80; @@ -168,7 +168,7 @@ http { # Forwarding authentication server server { # Variables for proxifying - set $admin {{ HOST_ADMIN }}; + set $admin {{ ADMIN_ADDRESS }}; listen 127.0.0.1:8000; diff --git a/core/nginx/config.py b/core/nginx/config.py index 78c76345..0e22766e 100755 --- a/core/nginx/config.py +++ b/core/nginx/config.py @@ -14,14 +14,14 @@ with open("/etc/resolv.conf") as handle: content = handle.read().split() args["RESOLVER"] = content[content.index("nameserver") + 1] -args["HOST_ADMIN"] = resolve(args.get("HOST_ADMIN", "admin")) -args["HOST_ANTISPAM"] = resolve(args.get("HOST_ANTISPAM", "antispam:11334")) +args["ADMIN_ADDRESS"] = resolve(args.get("HOST_ADMIN", "admin")) +args["ANTISPAM_ADDRESS"] = resolve(args.get("HOST_ANTISPAM", "antispam:11334")) args["HOST_WEBMAIL"] = args.get("HOST_WEBMAIL", "webmail") if args["WEBMAIL"] != "none": - args["HOST_WEBMAIL"] = resolve(args.get("HOST_WEBMAIL")) + args["WEBMAIL_ADDRESS"] = resolve(args.get("HOST_WEBMAIL")) args["HOST_WEBDAV"] = args.get("HOST_WEBDAV", "webdav:5232") if args["WEBDAV"] != "none": - args["HOST_WEBDAV"] = resolve(args.get("HOST_WEBDAV")) + args["WEBDAV_ADDRESS"] = resolve(args.get("HOST_WEBDAV")) # TLS configuration cert_name = os.getenv("TLS_CERT_FILENAME", default="cert.pem") diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf index d5d47d19..ea3219a2 100644 --- a/core/postfix/conf/main.cf +++ b/core/postfix/conf/main.cf @@ -65,7 +65,7 @@ virtual_mailbox_maps = ${podop}mailbox # Mails are transported if required, then forwarded to Dovecot for delivery relay_domains = ${podop}transport transport_maps = ${podop}transport -virtual_transport = lmtp:inet:{{ HOST_LMTP }} +virtual_transport = lmtp:inet:{{ LMTP_ADDRESS }} # In order to prevent Postfix from running DNS query, enforce the use of the # native DNS stack, that will check /etc/hosts properly. @@ -104,7 +104,7 @@ unverified_recipient_reject_reason = Address lookup failure # Milter ############### -smtpd_milters = inet:{{ HOST_ANTISPAM }} +smtpd_milters = inet:{{ ANTISPAM_ADDRESS }} milter_protocol = 6 milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} milter_default_action = tempfail diff --git a/core/postfix/start.py b/core/postfix/start.py index 716b3edb..2dd537f7 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -28,8 +28,8 @@ def start_podop(): # Actual startup script os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin")) -os.environ["HOST_ANTISPAM"] = resolve(os.environ.get("HOST_ANTISPAM", "antispam:11332")) -os.environ["HOST_LMTP"] = resolve(os.environ.get("HOST_LMTP", "imap:2525")) +os.environ["ANTISPAM_ADDRESS"] = resolve(os.environ.get("HOST_ANTISPAM", "antispam:11332")) +os.environ["LMTP_ADDRESS"] = resolve(os.environ.get("HOST_LMTP", "imap:2525")) for postfix_file in glob.glob("/conf/*.cf"): convert(postfix_file, os.path.join("/etc/postfix", os.path.basename(postfix_file))) diff --git a/services/rspamd/conf/history_redis.conf b/services/rspamd/conf/history_redis.conf index fee07024..053f9dd2 100644 --- a/services/rspamd/conf/history_redis.conf +++ b/services/rspamd/conf/history_redis.conf @@ -1 +1 @@ -servers = "{{ HOST_REDIS }}"; +servers = "{{ REDIS_ADDRESS }}"; diff --git a/services/rspamd/conf/redis.conf b/services/rspamd/conf/redis.conf index fee07024..053f9dd2 100644 --- a/services/rspamd/conf/redis.conf +++ b/services/rspamd/conf/redis.conf @@ -1 +1 @@ -servers = "{{ HOST_REDIS }}"; +servers = "{{ REDIS_ADDRESS }}"; diff --git a/services/rspamd/start.py b/services/rspamd/start.py index 78e2f37d..34a49604 100755 --- a/services/rspamd/start.py +++ b/services/rspamd/start.py @@ -10,7 +10,7 @@ log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING")) # Actual startup script os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front")) -os.environ["HOST_REDIS"] = resolve(os.environ.get("HOST_REDIS", "redis")) +os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("HOST_REDIS", "redis")) for rspamd_file in glob.glob("/conf/*"): convert(rspamd_file, os.path.join("/etc/rspamd/local.d", os.path.basename(rspamd_file))) From 0ce0b5ec02b2ff2644cb709975d6d338cddcd728 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Mon, 18 Feb 2019 15:41:22 +0200 Subject: [PATCH 08/11] Fix addresses in front --- core/admin/mailu/internal/nginx.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/admin/mailu/internal/nginx.py b/core/admin/mailu/internal/nginx.py index 2dac4db1..d5f2d697 100644 --- a/core/admin/mailu/internal/nginx.py +++ b/core/admin/mailu/internal/nginx.py @@ -80,12 +80,12 @@ def extract_host_port(host_and_port, default_port): def get_server(protocol, authenticated=False): if protocol == "imap": - hostname, port = extract_host_port(app.config['HOST_IMAP'], 143) + hostname, port = extract_host_port(app.config['IMAP_ADDRESS'], 143) elif protocol == "pop3": - hostname, port = extract_host_port(app.config['HOST_POP3'], 110) + hostname, port = extract_host_port(app.config['POP3_ADDRESS'], 110) elif protocol == "smtp": if authenticated: - hostname, port = extract_host_port(app.config['HOST_AUTHSMTP'], 10025) + hostname, port = extract_host_port(app.config['AUTHSMTP_ADDRESS'], 10025) else: - hostname, port = extract_host_port(app.config['HOST_SMTP'], 25) + hostname, port = extract_host_port(app.config['SMTP_ADDRESS'], 25) return hostname, port From 348ea1a5726821d500fe1acfd255a919d7f6dc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Wed, 21 Aug 2019 21:33:49 +0300 Subject: [PATCH 09/11] Remove obsolete log call --- core/admin/mailu/configuration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index d6429277..494f540a 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -106,7 +106,6 @@ class ConfigManager(dict): key: self.__coerce_value(os.environ.get(key, value)) for key, value in DEFAULT_CONFIG.items() }) - log.basicConfig(stream=sys.stderr, level=self.config["LOG_LEVEL"]) self.resolve_host() # automatically set the sqlalchemy string From ed0fb77a016065a30a360cab76377ee1aa7a38b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Wed, 21 Aug 2019 22:54:42 +0300 Subject: [PATCH 10/11] Catch empty WEBMAIL and WEBDAV address --- core/nginx/conf/nginx.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf index 0e89324a..1ffb44a2 100644 --- a/core/nginx/conf/nginx.conf +++ b/core/nginx/conf/nginx.conf @@ -43,8 +43,12 @@ http { # Variables for proxifying set $admin {{ ADMIN_ADDRESS }}; set $antispam {{ ANTISPAM_ADDRESS }}; + {% if WEBMAIL_ADDRESS %} set $webmail {{ WEBMAIL_ADDRESS }}; + {% endif %} + {% if WEBDAV_ADDRESS %} set $webdav {{ WEBDAV_ADDRESS }}; + {% endif %} # Always listen over HTTP listen 80; From 9058f357f221d07d0a595e835444a8027ba46be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Wed, 21 Aug 2019 23:51:44 +0300 Subject: [PATCH 11/11] Move from changlog to towncrier --- CHANGELOG.md | 1 - towncrier/newsfragments/884.bugfix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 towncrier/newsfragments/884.bugfix diff --git a/CHANGELOG.md b/CHANGELOG.md index f0e6fdca..f34ea3cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,6 @@ v1.6.1 - unreleased - Bug: Implement mailustart to resolve webmail in admin ([#716](https://github.com/Mailu/Mailu/issues/716)) - Bug: Rename cli commands and their options (replace "\_" with "-") ([#877](https://github.com/Mailu/Mailu/issues/877)) - Bug: Fix typo in migration script ([#905](https://github.com/Mailu/Mailu/issues/905)) -- BUG: Fix HOST_* variable usage ([#884](https://github.com/Mailu/Mailu/issues/884)) - Bug: Fix redis hostname in admin v1.6.0 - 2019-01-18 diff --git a/towncrier/newsfragments/884.bugfix b/towncrier/newsfragments/884.bugfix new file mode 100644 index 00000000..ced38267 --- /dev/null +++ b/towncrier/newsfragments/884.bugfix @@ -0,0 +1 @@ +Fix HOST_* variable usage \ No newline at end of file