From 0de2ec77c6027bd6fdfb0a1ef3b17762aab98667 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Tue, 23 Nov 2021 21:43:00 +0000 Subject: [PATCH] Process code review remarks #1441 --- core/postfix/start.py | 3 --- docs/configuration.rst | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/postfix/start.py b/core/postfix/start.py index 4509da40..af6b41db 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -36,9 +36,6 @@ os.environ["FRONT_ADDRESS"] = system.get_host_address_from_environment("FRONT", os.environ["ADMIN_ADDRESS"] = system.get_host_address_from_environment("ADMIN", "admin") os.environ["ANTISPAM_MILTER_ADDRESS"] = system.get_host_address_from_environment("ANTISPAM_MILTER", "antispam:11332") os.environ["LMTP_ADDRESS"] = system.get_host_address_from_environment("LMTP", "imap:2525") - -os.environ["LMTP_ADDRESS"] = system.get_host_address_from_environment("LMTP", "imap:2525") - os.environ["POSTFIX_LOG_SYSLOG"] = os.environ.get("POSTFIX_LOG_SYSLOG","disabled") for postfix_file in glob.glob("/conf/*.cf"): diff --git a/docs/configuration.rst b/docs/configuration.rst index 24045b15..1c01fc09 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -190,8 +190,8 @@ When using ``*_ADDRESS``, the hostnames must be full-qualified hostnames. Otherw resolve the hostnames. -Maillog setitngs ----------------- +Mail log settings +----------------- By default, all services log directly to stdout/stderr. Logs can be collected by any docker log processing solution. @@ -199,6 +199,6 @@ In some situations, a separate mail log is required (e.g. for legal reasons). Po syslog server that stores the log files to a volume. It can be configured by the following options: - ``POSTFIX_LOG_SYSLOG``: (default: ``disabled``) set to ``local`` to enable a local syslog server for postfix -- ``POSTFIX_LOG_FILE``: The file to log the maillog to +- ``POSTFIX_LOG_FILE``: The file to log the mail log to