Browse Source

Fix trap for postfix for proper sigterm handling

andryyy 8 years ago
parent
commit
977a5b4d47

+ 1 - 1
data/Dockerfiles/postfix/Dockerfile

@@ -22,4 +22,4 @@ 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

+ 1 - 6
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

+ 1 - 0
data/Dockerfiles/postfix/supervisord.conf

@@ -1,5 +1,6 @@
 [supervisord]
 nodaemon=true
+loglevel=debug
 
 [program:rsyslog]
 command=/usr/sbin/rsyslogd -n