From 5f6a8976a0f8cf2bb9d2c73bee5c3253b3b3f574 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 10 Oct 2016 15:58:32 +0000 Subject: [PATCH] IMAPS and outgoing TLS from prologic --- core/Dockerfile | 2 +- core/README.md | 1 + core/config/dovecot/dovecot.master | 3 +-- core/config/postfix/postfix.main.cf | 3 +++ core/config/postfix/postfix.master.cf.append | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index 7bbeffa..07736e8 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -93,6 +93,6 @@ RUN useradd -g vmail -u 5000 vmail -d /vmail -m # Volume to store email VOLUME ["/vmail"] -EXPOSE 25 143 587 4190 +EXPOSE 25 143 587 993 4190 CMD /boot && exec /usr/bin/supervisord -n -c /etc/supervisord.conf diff --git a/core/README.md b/core/README.md index 87bc218..98b81e6 100644 --- a/core/README.md +++ b/core/README.md @@ -53,6 +53,7 @@ Use the the example config files in `config/example` to get you started. -p 25:25 \ -p 587:587 \ -p 143:143 \ + -p 993:993 \ -p 4190:4190 \ -v /var/lib/dockermail/settings:/mail_settings \ -v /var/lib/dockermail/vmail:/vmail \ diff --git a/core/config/dovecot/dovecot.master b/core/config/dovecot/dovecot.master index 0de9f11..1014c61 100644 --- a/core/config/dovecot/dovecot.master +++ b/core/config/dovecot/dovecot.master @@ -5,9 +5,8 @@ service imap-login { } - #disable imaps since we use TLS connections through the standard imap inet_listener imaps { - port = 0 + } } diff --git a/core/config/postfix/postfix.main.cf b/core/config/postfix/postfix.main.cf index e75722f..a91677f 100644 --- a/core/config/postfix/postfix.main.cf +++ b/core/config/postfix/postfix.main.cf @@ -40,6 +40,9 @@ recipient_delimiter = + # SMTP configuration for incoming mail (port 25) # Outgoing mail (port 587) configuration is specified in master.cf +# Opportunistic TLS +smtp_tls_security_level = may + # allow all connections (since we want to receive mail from outside) smtpd_client_restrictions = permit diff --git a/core/config/postfix/postfix.master.cf.append b/core/config/postfix/postfix.master.cf.append index 853764f..dc5e4fb 100644 --- a/core/config/postfix/postfix.master.cf.append +++ b/core/config/postfix/postfix.master.cf.append @@ -5,6 +5,7 @@ dovecot unix - n n - - pipe # authenticate after HELO has been sent submission inet n - n - - smtpd -o smtpd_etrn_restrictions=reject + -o smtpd_tls_security_level=may -o smtpd_sasl_type=dovecot -o smtpd_sasl_path=private/auth -o smtpd_sasl_auth_enable=yes