From 1c50fd5195f9e5ac96034b75cb3e91a91eb3b567 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Fri, 3 Apr 2015 13:07:28 +0100
Subject: [PATCH] Last corrections for dkim support
---
dockerfiles/email/postfix/Dockerfile | 14 +++++++-------
unit-files/postfix.service | 2 +-
utils/add_email_support.sh | 10 +++++++++-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dockerfiles/email/postfix/Dockerfile b/dockerfiles/email/postfix/Dockerfile
index 5fb169a..19bd69c 100644
--- a/dockerfiles/email/postfix/Dockerfile
+++ b/dockerfiles/email/postfix/Dockerfile
@@ -67,13 +67,13 @@ RUN \
"smtpd_milters=inet:127.0.0.1:8891 inet:127.0.0.1:8893"\
non_smtpd_milters=\$smtpd_milters \
milter_default_action=accept && \
- echo "MinimumKeyBits 1024" >> /etc/opendkim && \
- echo "ExternalIgnoreList refile:/etc/opendkim/TrustedHosts" >> /etc/opendkim && \
- echo "InternalHosts refile:/etc/opendkim/TrustedHosts" >> /etc/opendkim && \
- echo "KeyTable refile:/etc/opendkim/KeyTable" >> /etc/opendkim && \
- echo "SigningTable refile:/etc/opendkim/SigningTable" >> /etc/opendkim && \
- echo "Socket inet:8891@localhost" >> /etc/opendkim && \
- echo "RequireSafeKeys false" >> /etc/opendkim
+ echo "MinimumKeyBits 1024" >> /etc/opendkim.conf && \
+ echo "ExternalIgnoreList refile:/etc/opendkim/TrustedHosts" >> /etc/opendkim.conf && \
+ echo "InternalHosts refile:/etc/opendkim/TrustedHosts" >> /etc/opendkim.conf && \
+ echo "KeyTable refile:/etc/opendkim/KeyTable" >> /etc/opendkim.conf && \
+ echo "SigningTable refile:/etc/opendkim/SigningTable" >> /etc/opendkim.conf && \
+ echo "Socket inet:8891@localhost" >> /etc/opendkim.conf && \
+ echo "RequireSafeKeys false" >> /etc/opendkim.conf
#RUN /opt/editconf.py /etc/postfix/main.cf \
#smtp_tls_security_level=dane \
diff --git a/unit-files/postfix.service b/unit-files/postfix.service
index cf470f5..a55ced8 100644
--- a/unit-files/postfix.service
+++ b/unit-files/postfix.service
@@ -28,7 +28,7 @@ ExecStart=/usr/bin/docker run \
--volumes-from=dovecot \
-p 25:25 \
-p 587:587 \
- -link=mysql-mail:db \
+ --link=mysql-mail:db \
indiepaas/postfix
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/utils/add_email_support.sh b/utils/add_email_support.sh
index 3c8643f..7e1370b 100755
--- a/utils/add_email_support.sh
+++ b/utils/add_email_support.sh
@@ -19,8 +19,16 @@ mkdir -p /data/domains/mail/opendkim/keys/$DOMAIN
/usr/bin/docker run \
--rm \
--name opendkim-genkey \
+ -v /data/domains/mail/opendkim:/etc/opendkim \
indiepaas/postfix \
- /usr/bin/opendkim-genkey -D /etc/opendkim/keys/$DOMAIN/ -d $DOMAIN -s mail && chown -R opendkim: /etc/opendkim/keys
+ /usr/bin/opendkim-genkey -D /etc/opendkim/keys/$DOMAIN/ -d $DOMAIN -s mail
+
+/usr/bin/docker run \
+ --rm \
+ --name opendkim-genkey \
+ -v /data/domains/mail/opendkim:/etc/opendkim \
+ indiepaas/postfix \
+ /bin/chown -R opendkim /etc/opendkim/keys
mv /data/domains/mail/opendkim/keys/$DOMAIN/mail.private /data/domains/mail/opendkim/keys/$DOMAIN/mail
--
GitLab