Page MenuHomeWMGMC Issues
Files F15868

No OneTemporary
Actions

View Options

diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile
index 1ca74d69..60c33cc0 100644
--- a/data/Dockerfiles/postfix/Dockerfile
+++ b/data/Dockerfiles/postfix/Dockerfile
@@ -1,25 +1,25 @@
From ubuntu:xenial
MAINTAINER Andre Peters <andre.peters@servercow.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update
RUN apt-get -y install supervisor \
postfix \
sasl2-bin \
postfix \
postfix-mysql \
postfix-pcre \
rsyslog \
ca-certificates
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY postfix.sh /opt/postfix.sh
RUN groupadd -g 5000 vmail
RUN useradd -g vmail -u 5000 vmail -d /var/vmail
EXPOSE 588
-CMD /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
diff --git a/data/Dockerfiles/postfix/postfix.sh b/data/Dockerfiles/postfix/postfix.sh
index e2cf2b5b..6e7aca83 100755
--- a/data/Dockerfiles/postfix/postfix.sh
+++ b/data/Dockerfiles/postfix/postfix.sh
@@ -1,12 +1,7 @@
#!/bin/bash
-# http://superuser.com/questions/168412/using-supervisord-to-control-the-postfix-mta
+trap "postfix stop" EXIT
-trap "postfix stop" SIGINT
-trap "postfix stop" SIGTERM
-trap "postfix reload" SIGHUP
-
-# start postfix
postfix -c /opt/postfix/conf start
sleep infinity
diff --git a/data/Dockerfiles/postfix/supervisord.conf b/data/Dockerfiles/postfix/supervisord.conf
index f49940fd..bae9a9aa 100644
--- a/data/Dockerfiles/postfix/supervisord.conf
+++ b/data/Dockerfiles/postfix/supervisord.conf
@@ -1,17 +1,18 @@
[supervisord]
nodaemon=true
+loglevel=debug
[program:rsyslog]
command=/usr/sbin/rsyslogd -n
autostart=true
autorestart=true
redirect_stderr=true
[program:postfix]
command=/opt/postfix.sh
autorestart=true
[program:postfix-maillog]
command=/usr/bin/tail -f /var/log/mail.log
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0

File Metadata

Mime Type
text/x-diff
Expires
9月 9 Tue, 5:45 AM (7 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5357
默认替代文本
(1 KB)

Event Timeline

WMGMC Technical Group