From 06dcb1b0821f8c4119b906bd143efa77e1ad9955 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Mon, 20 May 2019 20:09:07 +0200
Subject: [PATCH] mail: fix SSL CA settings

---
 roles/mail/templates/dovecot/local.conf.j2 | 1 -
 roles/mail/templates/postfix/main.cf.j2    | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/mail/templates/dovecot/local.conf.j2 b/roles/mail/templates/dovecot/local.conf.j2
index f2948c0..34a44a8 100644
--- a/roles/mail/templates/dovecot/local.conf.j2
+++ b/roles/mail/templates/dovecot/local.conf.j2
@@ -18,7 +18,6 @@ mail_gid = vmail
 ssl = yes
 ssl_cert = </etc/dovecot/ssl/{{ mail_server }}.crt
 ssl_key = </etc/dovecot/ssl/{{ mail_server }}.key
-ssl_ca = </etc/acme/lets-encrypt-x3-cross-signed.pem
 ssl_protocols = !SSLv3
 ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
 
diff --git a/roles/mail/templates/postfix/main.cf.j2 b/roles/mail/templates/postfix/main.cf.j2
index 79ff6b0..01f60d2 100644
--- a/roles/mail/templates/postfix/main.cf.j2
+++ b/roles/mail/templates/postfix/main.cf.j2
@@ -30,10 +30,11 @@ relayhost =
 # TLS parameters
 smtp_tls_security_level = may
 smtp_tls_loglevel = 1
+smtp_tls_CApath = /etc/ssl/certs
 
 smtpd_tls_cert_file=/etc/postfix/ssl/{{ mail_server }}.crt
 smtpd_tls_key_file=/etc/postfix/ssl/{{ mail_server }}.key
-smtpd_tls_CAfile=/etc/acme/lets-encrypt-x3-cross-signed.pem
+smtpd_tls_CApath = /etc/ssl/certs
 smtpd_tls_security_level = may
 smtpd_tls_auth_only = yes
 smtpd_tls_ciphers = medium