Merge branch 'dkim'

Install and configure OpenDKIM according to the instructions found in
the OpenDKIM readme: http://www.opendkim.org/opendkim-README

* dkim:
  opendkim: Start milter service
  opendkim: Disable syslog
  opendkim: Configure postfix milter socket
  opendkim: Generate keys / TXT record
  opendkim: Configure signing parameters
  opendkim: Add default config file
  opendkim: Setup package and data volume

1 files changed, 23 insertions, 1 deletions

diff --git a/Dockerfile b/Dockerfile
index f79830a..aa7c1ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,14 @@ RUN useradd \
     --skel /dev/null --create-home \
     mlmmj
 
+RUN useradd \
+    --uid 2003 \
+    --shell /usr/sbin/nologin \
+    --home-dir /run/opendkim \
+    opendkim
+
+RUN usermod -aG opendkim postfix
+
 # Install packages
 RUN apt update \
  && apt full-upgrade --yes \
@@ -32,17 +40,31 @@ RUN apt update \
     dovecot-core \
     dovecot-imapd \
     mlmmj \
+    opendkim \
     postfix \
     postfix-pcre \
     sudo \
  && apt clean
 
+# Generate OpenDKIM keypair
+# Do this here so we can print the pubkey/dns record to logs during build
+# process.  After initial run, a volume should preserve the keys for later
+# runs.
+RUN mkdir -p /opendkim \
+ && chown opendkim:opendkim /opendkim \
+ && opendkim-genkey \
+    --bits=1024 \
+    --directory=/opendkim \
+    --selector=default \
+ && cat /opendkim/default.txt
+
 # Install files
 COPY dovecot /etc/dovecot/
+COPY opendkim /etc/
 COPY postfix /etc/postfix/
 COPY userconfig /etc/userconfig/
 
-RUN find /etc/dovecot /etc/postfix -type f | xargs sed -i \
+RUN find /etc/dovecot /etc/opendkim.conf /etc/postfix -type f | xargs sed -i \
     "s/ENV_HOSTNAME/${HOSTNAME}/g; s/ENV_VIRTUAL_DOMAINS/${VIRTUAL_DOMAINS}/g"
 
 EXPOSE 25