Browse Source

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

tags/v1.0.0
Robin Thoni 7 years ago
parent
commit
8d232e313b
3 changed files with 10 additions and 2 deletions
  1. 1
    0
      dovecot/run.sh
  2. 1
    1
      opendkim/Dockerfile
  3. 8
    1
      opendkim/run.sh

+ 1
- 0
dovecot/run.sh View File

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

+ 1
- 1
opendkim/Dockerfile View File

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

+ 8
- 1
opendkim/run.sh View File

@@ -7,10 +7,17 @@ sed -e "s/POSTGRES_DB/${POSTGRES_DB}/" -i /etc/opendkim/opendkim.conf
7 7
 sed -e "s/OPENDKIM_PORT/${OPENDKIM_PORT}/" -i /etc/opendkim/opendkim.conf
8 8
 sed -e "s/MAIL_DOMAIN/${MAIL_DOMAIN}/" -i /etc/opendkim/KeyTable
9 9
 
10
+if [ ! -e /etc/opendkim/keys/dkim.private ]
11
+then
12
+  cd /etc/opendkim/keys &&
13
+  opendkim-genkey -s dkim -d "${MAIL_DOMAIN}"
14
+  cd --
15
+fi
16
+
10 17
 sleep 5
11 18
 
12 19
 rm -f /var/run/rsyslogd.pid
13
-rm -f /var/log/syslog
20
+rm -f /var/run/opendkim/opendkim.pid
14 21
 service rsyslog start
15 22
 service opendkim start
16 23
 #/usr/sbin/opendkim -f -v -x /etc/opendkim.conf

Loading…
Cancel
Save