From d97aa9d3b7262a4792358665eb9addd7004fec8f Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Wed, 1 Apr 2015 19:38:20 +0100 Subject: [PATCH] Moves supervisord --- dockerfiles/email/postfix/Dockerfile | 1 + dockerfiles/email/postfix/install.sh | 11 ----------- dockerfiles/email/postfix/supervisord.conf | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 dockerfiles/email/postfix/supervisord.conf diff --git a/dockerfiles/email/postfix/Dockerfile b/dockerfiles/email/postfix/Dockerfile index 3f211dc..73b9ee1 100644 --- a/dockerfiles/email/postfix/Dockerfile +++ b/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 && \ diff --git a/dockerfiles/email/postfix/install.sh b/dockerfiles/email/postfix/install.sh index d4d7633..d62a5ad 100644 --- a/dockerfiles/email/postfix/install.sh +++ b/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 diff --git a/dockerfiles/email/postfix/supervisord.conf b/dockerfiles/email/postfix/supervisord.conf new file mode 100644 index 0000000..5121333 --- /dev/null +++ b/dockerfiles/email/postfix/supervisord.conf @@ -0,0 +1,21 @@ +[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 + -- GitLab