allow also starttls connections

skylime · Feb 4, 2015 · e68be19 · e68be19
1 parent 55fb11c
commit e68be19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/copy/opt/core/var/mdata-setup/includes/31-dovecot.sh b/copy/opt/core/var/mdata-setup/includes/31-dovecot.sh
@@ -6,7 +6,7 @@ chmod 400 /opt/local/etc/dovecot/ssl/dovecot.pem
 
 if mdata-get mbox_ssl 1>/dev/null 2>&1; then
 	cat > /opt/local/etc/dovecot/conf.d/core-ssl.conf <<EOF
-ssl = yes
+ssl = required
 disable_plaintext_auth = yes
 ssl_cert = </opt/local/etc/dovecot/ssl/dovecot.pem
 ssl_key = </opt/local/etc/dovecot/ssl/dovecot.pem

diff --git a/copy/opt/local/etc/dovecot/dovecot.conf b/copy/opt/local/etc/dovecot/dovecot.conf
@@ -14,18 +14,6 @@ log_path        = /var/log/dovecot/main
 info_log_path   = /var/log/dovecot/info
 debug_log_path  = /var/log/dovecot/debug
 
-service imap-login {
-	inet_listener imap {
-		port = 0
-	}
-}
-
-service pop3-login {
-	inet_listener pop3 {
-		port = 0
-	}
-}
-
 service lmtp {
 	inet_listener lmtp {
 		address = ::1