tls fixes

docker-compose.yml

@@ -5,9 +5,9 @@ services:
         build: ./postgresql
         container_name: mx-postgresql
         networks:
-            internal.docker:
+            mx.internal.docker:
                 aliases:
-                    - postgresql.internal.docker
+                    - postgresql.mx.internal.docker
         volumes:
             - ./data/postgresql/data:/var/lib/postgresql/data
         ports:
@@ -19,9 +19,9 @@ services:
         build: ./postfixadmin
         container_name: mx-postfixadmin
         networks:
-            internal.docker:
+            mx.internal.docker:
                 aliases:
-                    - postfixadmin.internal.docker
+                    - postfixadmin.mx.internal.docker
         ports:
             - "34001:80"
         env_file:
@@ -31,9 +31,12 @@ services:
         build: ./postfix
         container_name: mx-postfix
         networks:
-            internal.docker:
+            mx.internal.docker:
                 aliases:
-                    - postfix.internal.docker
+                    - postfix.mx.internal.docker
+            mx-local.internal.docker:
+                aliases:
+                    - smtp.mx-local.internal.docker
         ports:
             - "0.0.0.0:25:25"
             - "0.0.0.0:587:587"
@@ -44,9 +47,12 @@ services:
         build: ./dovecot
         container_name: mx-dovecot
         networks:
-            internal.docker:
+            mx.internal.docker:
+                aliases:
+                    - dovecot.mx.internal.docker
+            mx-local.internal.docker:
                 aliases:
-                    - dovecot.internal.docker
+                    - imap.mx-local.internal.docker
         volumes:
             - ./data/dovecot/email:/var/email
             - ./data/dovecot/sieve:/etc/dovecot/sieve
@@ -63,13 +69,14 @@ services:
         build: ./opendkim
         container_name: mx-opendkim
         networks:
-            internal.docker:
+            mx.internal.docker:
                 aliases:
-                    - opendkim.internal.docker
+                    - opendkim.mx.internal.docker
         volumes:
             - ./data/opendkim/keys:/etc/opendkim/keys
         env_file:
             - env
 
 networks:
-    internal.docker:
+    mx.internal.docker:
+    mx-local.internal.docker:

dovecot/Dockerfile

@@ -6,9 +6,13 @@ 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 &&\
+    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/*

dovecot/config/dovecot.conf

@@ -40,6 +40,10 @@ protocol lda {
   postmaster_address = postmaster@example.org
 }
 
+protocol lmtp {
+  mail_plugins = sieve
+}
+
 plugin {
   # The path to the user's main active script. If ManageSieve is used, this the
   # location of the symbolic link controlled by ManageSieve.

dovecot/run.sh

@@ -5,4 +5,6 @@ sed -e "s/connect *=.*/connect = host=${POSTGRES_HOST} dbname=${POSTGRES_DB} use
 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
 
+service exim4 start &&
+
 dovecot -F

env

@@ -1,4 +1,4 @@
-POSTGRES_HOST=postgresql.internal.docker
+POSTGRES_HOST=postgresql.mx.internal.docker
 POSTGRES_USER=postfixadmin
 POSTGRES_PASSWORD=pg_password
 POSTGRES_DB=postfixadmin
@@ -6,9 +6,9 @@ POSTGRES_DB=postfixadmin
 MAIL_DOMAIN=rthoni.com
 MAIL_HOSTNAME=vm01.rthoni.com
 
-DOVECOT_HOST=dovecot.internal.docker
+DOVECOT_HOST=dovecot.mx.internal.docker
 DOVECOT_SASL_PORT=12345
 DOVECOT_LMTP_PORT=24
 
-OPENDKIM_HOST=opendkim.internal.docker
+OPENDKIM_HOST=opendkim.mx.internal.docker
 OPENDKIM_PORT=12345