From 92a92e532a43e601a20a5bc687ac13da241b81a5 Mon Sep 17 00:00:00 2001
From: Thomas Picouet <thomas.picouet@riseup.net>
Date: Thu, 29 Nov 2018 15:15:40 +0100
Subject: [PATCH] =?UTF-8?q?derni=C3=A8re=20modif=20pour=20dkim?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pica-mail-mta/Dockerfile    |  3 ++-
 pica-mail-mta/spam/opendkim | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pica-mail-mta/spam/opendkim

diff --git a/pica-mail-mta/Dockerfile b/pica-mail-mta/Dockerfile
index 3d4551c8..102d909f 100644
--- a/pica-mail-mta/Dockerfile
+++ b/pica-mail-mta/Dockerfile
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND noninteractive
 #installation des paquets debian
 RUN apt-get update -y \
   && apt-get install -y \
-      postfix postfix-ldap libsasl2-modules sasl2-bin opendkim opendkim-tools rsyslog telnet \
+      postfix postfix-ldap libsasl2-modules sasl2-bin opendkim opendkim-tools rsyslog telnet nano \
   && rm -rf /var/lib/apt/lists/*
 
 
@@ -49,6 +49,7 @@ ENV SMTPD_CLIENT_RESTRICTIONS reject_rbl_client sbl.spamhaus.org, reject_rbl_cli
 #configuration de OpenDKIM
 COPY spam/opendkim.conf /etc/
 COPY spam/dkimkeys/* /etc/dkimkeys/
+COPY spam/opendkim /etc/default/opendkim
 
 COPY saslauthd-postfix /etc/default/
 COPY entrypoint.sh /
diff --git a/pica-mail-mta/spam/opendkim b/pica-mail-mta/spam/opendkim
new file mode 100644
index 00000000..c347238e
--- /dev/null
+++ b/pica-mail-mta/spam/opendkim
@@ -0,0 +1,22 @@
+# Command-line options specified here will override the contents of
+# /etc/opendkim.conf. See opendkim(8) for a complete list of options.
+#DAEMON_OPTS=""
+# Change to /var/spool/postfix/var/run/opendkim to use a Unix socket with
+# postfix in a chroot:
+#RUNDIR=/var/spool/postfix/var/run/opendkim
+RUNDIR=/var/spool/postfix/opendkim
+#
+# Uncomment to specify an alternate socket
+# Note that setting this will override any Socket value in opendkim.conf
+# default:
+SOCKET=local:$RUNDIR/opendkim.sock
+# listen on all interfaces on port 54321:
+#SOCKET=inet:54321
+# listen on loopback on port 12345:
+#SOCKET=inet:12345@localhost
+# listen on 192.0.2.1 on port 12345:
+#SOCKET=inet:12345@192.0.2.1
+USER=opendkim
+GROUP=opendkim
+PIDFILE=$RUNDIR/$NAME.pid
+EXTRAAFTER=
-- 
GitLab