From c59cc49baf4e1dceac4e09a69e9c42bfae4058ac Mon Sep 17 00:00:00 2001
From: fcojean <francois.cojean@gmail.com>
Date: Thu, 17 Sep 2015 16:05:02 +0200
Subject: [PATCH 1/2] Set opendkim permission on domainkeys directory to avoid
 dkim to cancel email sending.

---
 assets/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/install.sh b/assets/install.sh
index 0b2aaff..66dca73 100755
--- a/assets/install.sh
+++ b/assets/install.sh
@@ -126,5 +126,7 @@ EOF
 cat >> /etc/opendkim/SigningTable <<EOF
 *@$maildomain mail._domainkey.$maildomain
 EOF
+chown opendkim:opendkim /etc/opendkim/domainkeys
 chown opendkim:opendkim $(find /etc/opendkim/domainkeys -iname *.private)
-chmod 400 $(find /etc/opendkim/domainkeys -iname *.private)
\ No newline at end of file
+chmod 500 /etc/opendkim/domainkeys
+chmod 400 $(find /etc/opendkim/domainkeys -iname *.private)

From 9c35d4f50685e03d82bb5fad8ec49a548914caff Mon Sep 17 00:00:00 2001
From: fcojean <francois.cojean@gmail.com>
Date: Fri, 18 Sep 2015 16:58:20 +0200
Subject: [PATCH 2/2] Add DMARC support.

---
 Dockerfile        |  2 +-
 assets/install.sh | 36 ++++++++++++++++++++++++++++++++++--
 build.sh          |  2 +-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5395bf5..ceda6d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update
 
 # Start editing
 # Install package here for cache
-RUN apt-get -y install supervisor postfix sasl2-bin opendkim opendkim-tools
+RUN apt-get -y install supervisor postfix sasl2-bin opendkim opendkim-tools opendmarc
 
 # Add files
 ADD assets/install.sh /opt/install.sh
diff --git a/assets/install.sh b/assets/install.sh
index 66dca73..2f52953 100755
--- a/assets/install.sh
+++ b/assets/install.sh
@@ -83,8 +83,8 @@ EOF
 # /etc/postfix/main.cf
 postconf -e milter_protocol=2
 postconf -e milter_default_action=accept
-postconf -e smtpd_milters=inet:localhost:12301
-postconf -e non_smtpd_milters=inet:localhost:12301
+postconf -e smtpd_milters=inet:localhost:12301,inet:localhost:12302
+postconf -e non_smtpd_milters=inet:localhost:12301,inet:localhost:12302
 
 cat >> /etc/opendkim.conf <<EOF
 AutoRestart             Yes
@@ -130,3 +130,35 @@ chown opendkim:opendkim /etc/opendkim/domainkeys
 chown opendkim:opendkim $(find /etc/opendkim/domainkeys -iname *.private)
 chmod 500 /etc/opendkim/domainkeys
 chmod 400 $(find /etc/opendkim/domainkeys -iname *.private)
+
+#############
+# opendmarc
+#############
+cat >> /etc/supervisor/conf.d/supervisord.conf <<EOF
+
+[program:opendmarc]
+command=/usr/sbin/opendmarc -f
+EOF
+
+cat >> /etc/opendmarc.conf <<EOF
+AuthservID $maildomain
+PidFile /var/run/opendmarc.pid 
+RejectFailures false
+Syslog true
+TrustedAuthservIDs $maildomain
+UMask 0002
+UserID opendmarc:opendmarc
+IgnoreHosts /etc/opendmarc/ignore.hosts
+HistoryFile /var/run/opendmarc/opendmarc.dat
+EOF
+
+mkdir /etc/opendmarc
+cat >> /etc/opendmarc/ignore.hosts <<EOF
+127.0.0.1
+localhost
+192.168.0.1/24
+EOF
+
+cat >> /etc/default/opendmarc <<EOF
+SOCKET="inet:12302@localhost"
+EOF
diff --git a/build.sh b/build.sh
index d7b5420..5c5e4db 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t catatnight/postfix .
\ No newline at end of file
+docker build -t seeitlater/postfix .