dkim auto key generation if does not exist; rm old pid files

dovecot/run.sh

@@ -19,6 +19,7 @@ replace_vars /etc/exim4/passwd.client
 
 
 rm -f /var/run/dovecot/master.pid &&
+rm -f /var/run/exim4/exim.pid &&
 service exim4 start &&
 
 dovecot -F

opendkim/Dockerfile

@@ -3,7 +3,7 @@ FROM debian:jessie
 MAINTAINER Robin Thoni <robin@rthoni.com>
 
 RUN apt-get update &&\
-    apt-get install -y opendkim libopendbx1-pgsql rsyslog &&\
+    apt-get install -y opendkim opendkim-tools openssl libopendbx1-pgsql rsyslog &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN rm /etc/opendkim.conf &&\

opendkim/run.sh

@@ -7,10 +7,17 @@ sed -e "s/POSTGRES_DB/${POSTGRES_DB}/" -i /etc/opendkim/opendkim.conf
 sed -e "s/OPENDKIM_PORT/${OPENDKIM_PORT}/" -i /etc/opendkim/opendkim.conf
 sed -e "s/MAIL_DOMAIN/${MAIL_DOMAIN}/" -i /etc/opendkim/KeyTable
 
+if [ ! -e /etc/opendkim/keys/dkim.private ]
+then
+  cd /etc/opendkim/keys &&
+  opendkim-genkey -s dkim -d "${MAIL_DOMAIN}"
+  cd --
+fi
+
 sleep 5
 
 rm -f /var/run/rsyslogd.pid
-rm -f /var/log/syslog
+rm -f /var/run/opendkim/opendkim.pid
 service rsyslog start
 service opendkim start
 #/usr/sbin/opendkim -f -v -x /etc/opendkim.conf