From deab70fe640486227eb201385fd36df43aee65ff Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Wed, 12 Oct 2016 13:23:59 +0200
Subject: [PATCH] Disable STARTTLS and use TLS instead

---
 core/Dockerfile                              | 2 +-
 core/README.md                               | 3 +--
 core/config/dovecot/dovecot.master           | 3 ++-
 core/config/dovecot/dovecot.ssl              | 2 +-
 core/config/postfix/postfix.master.cf.append | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index adba1a0..aa0d714 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -91,6 +91,6 @@ RUN useradd -g vmail -u 5000 vmail -d /vmail -m
 # Volume to store email
 VOLUME ["/vmail"]
 
-EXPOSE 25 143 587 993 4190
+EXPOSE 25 465 993 4190
 
 CMD /boot && exec /usr/bin/supervisord -n -c /etc/supervisord.conf
diff --git a/core/README.md b/core/README.md
index 98b81e6..5306b81 100644
--- a/core/README.md
+++ b/core/README.md
@@ -51,8 +51,7 @@ Use the the example config files in `config/example` to get you started.
 		docker run -ti -d \
 		  --name dockermail \
 		  -p 25:25 \
-		  -p 587:587 \
-		  -p 143:143 \
+		  -p 465:465 \
 		  -p 993:993 \
 		  -p 4190:4190 \
 		  -v /var/lib/dockermail/settings:/mail_settings \
diff --git a/core/config/dovecot/dovecot.master b/core/config/dovecot/dovecot.master
index 1014c61..cde87f3 100644
--- a/core/config/dovecot/dovecot.master
+++ b/core/config/dovecot/dovecot.master
@@ -1,8 +1,9 @@
 listen = "*, [::]"
 
 service imap-login {
+  # disable starttls
   inet_listener imap {
-
+	port = 0
   }
 
   inet_listener imaps {
diff --git a/core/config/dovecot/dovecot.ssl b/core/config/dovecot/dovecot.ssl
index 33dab84..dbd4660 100644
--- a/core/config/dovecot/dovecot.ssl
+++ b/core/config/dovecot/dovecot.ssl
@@ -1,4 +1,4 @@
-ssl = yes
+ssl = required
 disable_plaintext_auth = no
 ssl_cert = </etc/ssl/server/email.crt
 ssl_key = </etc/ssl/server/email.key
diff --git a/core/config/postfix/postfix.master.cf.append b/core/config/postfix/postfix.master.cf.append
index dc5e4fb..d46d259 100644
--- a/core/config/postfix/postfix.master.cf.append
+++ b/core/config/postfix/postfix.master.cf.append
@@ -6,6 +6,7 @@ dovecot   unix  -       n       n       -       -       pipe
 submission      inet    n       -       n       -       -       smtpd
  -o smtpd_etrn_restrictions=reject
  -o smtpd_tls_security_level=may
+ -o smtpd_tls_wrappermode=yes
  -o smtpd_sasl_type=dovecot
  -o smtpd_sasl_path=private/auth
  -o smtpd_sasl_auth_enable=yes