Moves supervisord

dockerfiles/email/postfix/Dockerfile

@@ -14,6 +14,7 @@ COPY postfix_outgoing_mail_header_filters /etc/postfix/outgoing_mail_header_filt
 COPY virtual-mailbox-domains.cf /etc/postfix/virtual-mailbox-domains.cf
 COPY virtual-mailbox-maps.cf /etc/postfix/virtual-mailbox-maps.cf
 COPY virtual-alias-maps.cf /etc/postfix/virtual-alias-maps.cf
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 RUN \
   chmod u+x /install.sh && \

dockerfiles/email/postfix/install.sh

@@ -18,16 +18,5 @@ sed -i "s/##HOSTNAME##/$HOSTNAME/" /etc/postfix/main.cf
 
 chown -R postfix:postfix /var/spool/postfix/dovecot
 
-#supervisor
-cat > /etc/supervisor/conf.d/supervisord.conf <<EOF
-[supervisord]
-nodaemon=true
-
-[program:postfix]
-process_name = master
-command = /etc/init.d/postfix start
-startsecs = 0
-autorestart = false
-
 EOF
 

dockerfiles/email/postfix/supervisord.conf

+[supervisord]
+nodaemon=true
+
+[program:postfix]
+process_name = postfix
+command = /etc/init.d/postfix start
+startsecs = 0
+autorestart = false
+
+[program:opendkim]
+process_name = opendkim
+command = /etc/init.d/opendkim start
+startsecs = 0
+autorestart = false
+
+[program:opendmarc]
+process_name = opendmarc
+command = /etc/init.d/opendmarc start
+startsecs = 0
+autorestart = false
+