Updated opendkim

opendkim/Dockerfile

@@ -1,33 +1,10 @@
-FROM debian:jessie
+FROM debian:stretch
 
-MAINTAINER Robin Thoni <robin@rthoni.com>
+ADD https://raw.githubusercontent.com/docker-gcf/docker-gcf/v1.5.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
+ENTRYPOINT ["gcf-entrypoint"]
+CMD ["opendkim", "-f"]
 
-RUN apt-get update &&\
-    apt-get install -y opendkim opendkim-tools openssl libopendbx1-pgsql rsyslog &&\
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN pkgs-install opendkim opendkim-tools openssl libopendbx1-pgsql rsyslog
 
-RUN rm /etc/opendkim.conf &&\
-    ln -s /etc/opendkim/opendkim.conf /etc/opendkim.conf
-
-RUN rm -rf /var/log/* &&\
-    mkfifo /var/log/syslog &&\
-    ln -s /dev/null /var/log/mail.log &&\
-    ln -s /dev/null /var/log/mail.err &&\
-    ln -s /dev/null /var/log/main.info &&\
-    ln -s /dev/null /var/log/messages
-
-RUN sed -e 's/\(\$ModLoad imklog.*\)/#\1/' -i /etc/rsyslog.conf
-
-COPY ./config /etc/opendkim/
-
-RUN chown -R opendkim:opendkim /etc/opendkim
-
-COPY ./vars-vars /etc/vars-vars
-
-COPY ./vars-files /etc/vars-files
-
-COPY ./run.sh /run.sh
-
-VOLUME ["/etc/opendkim/keys"]
-
-CMD ["/run.sh"]
+COPY ./config /etc/salt/base/

opendkim/config.sql/opendkim.conf

@@ -1,21 +0,0 @@
-AutoRestart             Yes
-AutoRestartRate         10/1h
-UMask                   002
-Syslog                  yes
-SyslogSuccess           yes
-LogWhy                  Yes
-
-Canonicalization        relaxed/simple
-
-ExternalIgnoreList      dsn:pgsql://POSTGRES_USER:POSTGRES_PASSWORD@POSTGRES_HOST/POSTGRES_DB/table=dkim_external_ignore_list?keycol=host?datacol=host
-InternalHosts           dsn:pgsql://POSTGRES_USER:POSTGRES_PASSWORD@POSTGRES_HOST/POSTGRES_DB/table=dkim_internal_hosts?keycol=host?datacol=host
-KeyTable                dsn:pgsql://POSTGRES_USER:POSTGRES_PASSWORD@POSTGRES_HOST/POSTGRES_DB/table=dkim_key_table?keycol=name?datacol=key_path
-SigningTable            dsn:pgsql://POSTGRES_USER:POSTGRES_PASSWORD@POSTGRES_HOST/POSTGRES_DB/table=dkim_signing_table?keycol=email?datacol=name
-
-Mode                    sv
-PidFile                 /var/run/opendkim/opendkim.pid
-SignatureAlgorithm      rsa-sha256
-
-UserID                  opendkim:opendkim
-
-Socket                  inet:OPENDKIM_PORT@0.0.0.0

opendkim/config/KeyTable

@@ -1 +0,0 @@
-all                  MAIL_DOMAIN:dkim:/etc/opendkim/keys/dkim.private

opendkim/config/TrustedHosts

@@ -1,3 +0,0 @@
-127.0.0.1
-localhost
-postfix.internal.docker

opendkim/config/states/opendkim/config/KeyTable

@@ -0,0 +1 @@
+all                  {{ salt['pillar.get']("model:common:mail:domain") }}:dkim:/etc/opendkim/keys/dkim.private

opendkim/config/states/opendkim/config/TrustedHosts

@@ -0,0 +1,3 @@
+127.0.0.1
+localhost
+{{ salt['pillar.get']("model:common:mail:host") }}

opendkim/config/opendkim.conf → opendkim/config/states/opendkim/config/opendkim.conf

@@ -20,4 +20,4 @@ SignatureAlgorithm      rsa-sha256
 
 UserID                  opendkim:opendkim
 
-Socket                  inet:OPENDKIM_PORT@0.0.0.0
+Socket                  inet:{{ salt['pillar.get']("model:opendkim:port") }}@0.0.0.0

opendkim/config/states/opendkim/init.sls

@@ -0,0 +1,32 @@
+opendkim-config:
+  file.recurse:
+    - name: /etc/opendkim
+    - source: salt://opendkim/config
+    - user: opendkim
+    - group: opendkim
+    - template: jinja
+
+opendkim-config-etc:
+  file.symlink:
+    - name: /etc/opendkim.conf
+    - target: /etc/opendkim/opendkim.conf
+    - force: True
+
+opendkim-pid-file:
+  file.absent:
+    - name: /var/run/opendkim/opendkim.pid
+
+opendkim-key:
+  cmd.run:
+    - name: opendkim-genkey -s dkim -d "$(cat /tmp/gcf-model.json | jq -r .model.common.mail.domain)"
+    - cwd: /etc/opendkim/keys
+    - creates: /etc/opendkim/keys/dkim.private
+
+opendkim-key-owner:
+  file.directory:
+    - name: /etc/opendkim/keys
+    - user: opendkim
+    - group: opendkim
+    - recurse:
+      - user
+      - group

opendkim/run.sh

@@ -1,43 +0,0 @@
-#! /usr/bin/env bash
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  for file in $(cat /etc/vars-files)
-  do
-    replace_vars "${file}"
-  done
-}
-
-replace_files
-
-if [ ! -e /etc/opendkim/keys/dkim.private ]
-then
-  cd /etc/opendkim/keys &&
-  opendkim-genkey -s dkim -d "${MAIL_DOMAIN}" &&
-  chown opendkim:opendkim dkim.private dkim.txt
-  cd --
-fi
-
-sleep 5
-
-rm -f /var/run/rsyslogd.pid
-rm -f /var/run/opendkim/opendkim.pid
-service rsyslog start
-service opendkim start &&
-cat /var/log/syslog

opendkim/vars-files

@@ -1,2 +0,0 @@
-/etc/opendkim/opendkim.conf
-/etc/opendkim/KeyTable

opendkim/vars-vars

@@ -1,23 +0,0 @@
-POSTGRES_HOST
-POSTGRES_USER
-POSTGRES_PASSWORD
-POSTGRES_DB
-
-MAIL_DOMAIN
-MAIL_HOSTNAME
-
-DOVECOT_HOST
-DOVECOT_SASL_PORT
-DOVECOT_LMTP_PORT
-
-POSTFIX_HOST
-
-OPENDKIM_HOST
-OPENDKIM_PORT
-
-MILTER_SASL_HOST
-MILTER_SASL_PORT
-
-EXIM_SMARTHOST_HOST
-EXIM_SMARTHOST_USER
-EXIM_SMARTHOST_PASSWORD