diff --git a/roles/mailserver/dovecot/files/conf.d/10-ssl.conf b/roles/mailserver/dovecot/files/conf.d/10-ssl.conf --- a/roles/mailserver/dovecot/files/conf.d/10-ssl.conf +++ b/roles/mailserver/dovecot/files/conf.d/10-ssl.conf @@ -13,7 +13,7 @@ # and will be lost if the state is redeployed. # </auto-generated> -ssl_cert = </usr/local/etc/letsencrypt/live/mail.nasqueron.org/fullchain.pem -ssl_key = </usr/local/etc/letsencrypt/live/mail.nasqueron.org/privkey.pem +ssl_cert = </var/certificates/mail.nasqueron.org/fullchain.pem +ssl_key = </var/certificates/mail.nasqueron.org/privkey.pem ssl = required diff --git a/roles/mailserver/postfix/files/main.cf b/roles/mailserver/postfix/files/main.cf --- a/roles/mailserver/postfix/files/main.cf +++ b/roles/mailserver/postfix/files/main.cf @@ -89,8 +89,8 @@ smtp_tls_CApath = {{ postfix_dirs.cacerts }} smtpd_tls_security_level=may -smtpd_tls_cert_file=/usr/local/etc/letsencrypt/live/mail.nasqueron.org/fullchain.pem -smtpd_tls_key_file=/usr/local/etc/letsencrypt/live/mail.nasqueron.org/privkey.pem +smtpd_tls_cert_file=/var/certificates/mail.nasqueron.org/fullchain.pem +smtpd_tls_key_file=/var/certificates/mail.nasqueron.org/key.pem smtpd_tls_mandatory_ciphers = high smtpd_tls_mandatory_exclude_ciphers = aNULL,MD5 diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf --- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf +++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf @@ -24,8 +24,8 @@ server_name admin.mail.nasqueron.org; include includes/tls; - ssl_certificate /usr/local/etc/letsencrypt/live/admin.mail.nasqueron.org/fullchain.pem; - ssl_certificate_key /usr/local/etc/letsencrypt/live/admin.mail.nasqueron.org/privkey.pem; + ssl_certificate /var/certificates/admin.mail.nasqueron.org/fullchain.pem; + ssl_certificate_key /var/certificates/admin.mail.nasqueron.org/key.pem; error_log /var/log/www/nasqueron.org/admin.mail-error.log; access_log /var/log/www/nasqueron.org/admin.mail-access.log;