changed dovecot exim4 config to smarthost

dovecot/Dockerfile

@@ -4,23 +4,23 @@ MAINTAINER Robin Thoni <robin@rthoni.com>
 
 RUN groupadd -r email --gid=7788 && useradd -r -g email --uid=7788 email
 
-
 RUN apt-get update &&\
     apt-get install -y dovecot-imapd dovecot-pop3d dovecot-sieve dovecot-managesieved dovecot-pgsql dovecot-lmtpd exim4 &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN sed -e "s/dc_eximconfig_configtype=.*/dc_eximconfig_configtype='internet'/" -i /etc/exim4/update-exim4.conf.conf &&\
-    sed -e "s/dc_other_hostnames=.*/dc_other_hostnames=''/" -i /etc/exim4/update-exim4.conf.conf &&\
-    update-exim4.conf
-
-COPY ./run.sh /run.sh
-
 RUN rm -rf /etc/dovecot/*
 
 COPY ./config/ /etc/dovecot/
 
 COPY ./certs/ /etc/ssl/private/
 
+COPY ./exim4/ /etc/exim4/
+
+RUN chown root:Debian-exim /etc/exim4/passwd.client &&\
+    update-exim4.conf
+
+COPY ./run.sh /run.sh
+
 VOLUME ["/var/email", "/etc/dovecot/sieve"]
 
 EXPOSE 110 143 993 995 4190

dovecot/exim4/passwd.client

@@ -0,0 +1 @@
+EXIM_SMARTHOST_HOST:EXIM_SMARTHOST_USER:EXIM_SMARTHOST_PASSWORD

dovecot/exim4/update-exim4.conf.conf

@@ -0,0 +1,31 @@
+# /etc/exim4/update-exim4.conf.conf
+#
+# Edit this file and /etc/mailname by hand and execute update-exim4.conf
+# yourself or use 'dpkg-reconfigure exim4-config'
+#
+# Please note that this is _not_ a dpkg-conffile and that automatic changes
+# to this file might happen. The code handling this will honor your local
+# changes, so this is usually fine, but will break local schemes that mess
+# around with multiple versions of the file.
+#
+# update-exim4.conf uses this file to determine variable values to generate
+# exim configuration macros for the configuration file.
+#
+# Most settings found in here do have corresponding questions in the
+# Debconf configuration, but not all of them.
+#
+# This is a Debian specific file
+
+dc_eximconfig_configtype='smarthost'
+dc_other_hostnames=''
+dc_local_interfaces='127.0.0.1 ; ::1'
+dc_readhost=''
+dc_relay_domains=''
+dc_minimaldns='false'
+dc_relay_nets=''
+dc_smarthost='EXIM_SMARTHOST_HOST::587'
+CFILEMODE='644'
+dc_use_split_config='true'
+dc_hide_mailname='false'
+dc_mailname_in_oh='true'
+dc_localdelivery='mail_spool'

dovecot/run.sh

@@ -1,10 +1,24 @@
 #! /usr/bin/env sh
 
+replace_vars()
+{
+  file="${1}"
+  sed -e "s/DOVECOT_LMTP_PORT/${DOVECOT_LMTP_PORT}/" -i "${file}"
+  sed -e "s/DOVECOT_SASL_PORT/${DOVECOT_SASL_PORT}/" -i "${file}"
+  sed -e "s/EXIM_SMARTHOST_HOST/${EXIM_SMARTHOST_HOST}/" -i "${file}"
+  sed -e "s/EXIM_SMARTHOST_USER/${EXIM_SMARTHOST_USER}/" -i "${file}"
+  sed -e "s/EXIM_SMARTHOST_PASSWORD/${EXIM_SMARTHOST_PASSWORD}/" -i "${file}"
+}
+
 sed -e "s/connect *=.*/connect = host=${POSTGRES_HOST} dbname=${POSTGRES_DB} user=${POSTGRES_USER} password=${POSTGRES_PASSWORD}/g" -i /etc/dovecot/dovecot-pgsql.conf
 
-sed -e "s/DOVECOT_LMTP_PORT/${DOVECOT_LMTP_PORT}/" -i /etc/dovecot/dovecot.conf
-sed -e "s/DOVECOT_SASL_PORT/${DOVECOT_SASL_PORT}/" -i /etc/dovecot/dovecot.conf
 
+replace_vars /etc/dovecot/dovecot.conf
+replace_vars /etc/exim4/update-exim4.conf.conf
+replace_vars /etc/exim4/passwd.client
+
+
+rm -f /var/run/dovecot/master.pid &&
 service exim4 start &&
 
 dovecot -F

env

@@ -14,3 +14,7 @@ POSTFIX_HOST=postfix.mx.internal.docker
 
 OPENDKIM_HOST=opendkim.mx.internal.docker
 OPENDKIM_PORT=12345
+
+EXIM_SMARTHOST_HOST=test-mx.rthoni.com
+EXIM_SMARTHOST_USER=smarthost@test-mx.rthoni.com
+EXIM_SMARTHOST_PASSWORD=smarthost