diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index f9a5ac24..578294df 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -15,7 +15,7 @@ COPY start.py / RUN echo $VERSION >/version #EXPOSE 25/tcp 10025/tcp -HEALTHCHECK --start-period=350s CMD /usr/sbin/postfix status +HEALTHCHECK --start-period=30s CMD ! /usr/libexec/postfix/master -t VOLUME ["/queue"] diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf index 2e038f61..3e63dd91 100644 --- a/core/postfix/conf/main.cf +++ b/core/postfix/conf/main.cf @@ -6,6 +6,7 @@ mydomain = {{ DOMAIN }} myhostname = {{ HOSTNAMES.split(",")[0] }} myorigin = $mydomain +maillog_file = /dev/stdout # Queue location queue_directory = /queue diff --git a/core/postfix/conf/master.cf b/core/postfix/conf/master.cf index 569ea718..f88a19b3 100644 --- a/core/postfix/conf/master.cf +++ b/core/postfix/conf/master.cf @@ -52,6 +52,7 @@ discard unix - - n - - discard lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache +postlog unix-dgram n - n - 1 postlogd {# Ensure that the rendered file ends with a newline #} {{- "\n" }} diff --git a/core/postfix/start.py b/core/postfix/start.py index 149e4dae..56adba4f 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -11,7 +11,6 @@ from podop import run_server from socrate import system, conf system.set_env(log_filters=[ - r'the Postfix mail system is running\: \d+$', r'(dis)?connect from localhost\[(\:\:1|127\.0\.0\.1)\]( quit=1 commands=1)?$', r'haproxy read\: short protocol header\: QUIT$', r'discarding EHLO keywords\: PIPELINING$', diff --git a/towncrier/newsfragments/2793.bugfix b/towncrier/newsfragments/2793.bugfix new file mode 100644 index 00000000..d57c9bb9 --- /dev/null +++ b/towncrier/newsfragments/2793.bugfix @@ -0,0 +1 @@ +The SMTP container wasn't logging things like it should