mirror of
https://github.com/Mailu/Mailu.git
synced 2025-01-26 03:52:50 +02:00
Start postfix directly with stdout logging
This commit is contained in:
parent
9c1675e9d8
commit
d155b2c533
@ -9,7 +9,7 @@ RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart
|
||||
RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37
|
||||
# Image specific layers under this line
|
||||
|
||||
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain rsyslog
|
||||
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain
|
||||
|
||||
COPY conf /conf
|
||||
COPY start.py /start.py
|
||||
|
@ -2,6 +2,9 @@
|
||||
# General
|
||||
###############
|
||||
|
||||
# Logging configuration
|
||||
maillog_file = /dev/stdout
|
||||
|
||||
# Main domain and hostname
|
||||
mydomain = {{ DOMAIN }}
|
||||
myhostname = {{ HOSTNAMES.split(",")[0] }}
|
||||
|
@ -33,3 +33,5 @@ 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
|
||||
|
||||
|
@ -1,4 +0,0 @@
|
||||
$ModLoad imuxsock
|
||||
$template noTimestampFormat,"%syslogtag%%msg%\n"
|
||||
$ActionFileDefaultTemplate noTimestampFormat
|
||||
*.*;auth,authpriv.none /dev/stdout
|
@ -48,12 +48,9 @@ for map_file in glob.glob("/overrides/*.map"):
|
||||
os.system("postmap {}".format(destination))
|
||||
os.remove(destination)
|
||||
|
||||
convert("/conf/rsyslog.conf", "/etc/rsyslog.conf")
|
||||
|
||||
# Run Podop and Postfix
|
||||
multiprocessing.Process(target=start_podop).start()
|
||||
if os.path.exists("/var/run/rsyslogd.pid"):
|
||||
os.remove("/var/run/rsyslogd.pid")
|
||||
os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing")
|
||||
os.system("/usr/libexec/postfix/master &")
|
||||
os.execv("/usr/sbin/rsyslogd", ["rsyslogd", "-n"])
|
||||
os.system("postfix start-fg")
|
||||
|
Loading…
x
Reference in New Issue
Block a user