scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-02 02:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logs in the SMTP container

Browse Source
This commit is contained in:
Florent Daigniere
2023-04-21 14:42:25 +02:00
parent 1f9cd7db99
commit eec9d1201f
5 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/postfix/Dockerfile
View File

@@ -15,7 +15,7 @@ COPY start.py /
RUN echo $VERSION >/version RUN echo $VERSION >/version
#EXPOSE 25/tcp 10025/tcp #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"] VOLUME ["/queue"]

1
core/postfix/conf/main.cf
View File

@@ -6,6 +6,7 @@
mydomain = {{ DOMAIN }} mydomain = {{ DOMAIN }}
myhostname = {{ HOSTNAMES.split(",")[0] }} myhostname = {{ HOSTNAMES.split(",")[0] }}
myorigin = $mydomain myorigin = $mydomain
maillog_file = /dev/stdout
# Queue location # Queue location
queue_directory = /queue queue_directory = /queue

1
core/postfix/conf/master.cf
View File

@@ -52,6 +52,7 @@ discard unix - - n - - discard
lmtp unix - - n - - lmtp lmtp unix - - n - - lmtp
anvil unix - - n - 1 anvil anvil unix - - n - 1 anvil
scache unix - - n - 1 scache scache unix - - n - 1 scache
postlog unix-dgram n - n - 1 postlogd
{# Ensure that the rendered file ends with a newline #} {# Ensure that the rendered file ends with a newline #}
{{- "\n" }} {{- "\n" }}

1
core/postfix/start.py
View File

@@ -11,7 +11,6 @@ from podop import run_server
from socrate import system, conf from socrate import system, conf
system.set_env(log_filters=[ 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'(dis)?connect from localhost\[(\:\:1|127\.0\.0\.1)\]( quit=1 commands=1)?$',
r'haproxy read\: short protocol header\: QUIT$', r'haproxy read\: short protocol header\: QUIT$',
r'discarding EHLO keywords\: PIPELINING$', r'discarding EHLO keywords\: PIPELINING$',

1
towncrier/newsfragments/2793.bugfix Normal file
View File

@@ -0,0 +1 @@
The SMTP container wasn't logging things like it should