From ad92886aa888b0e2c646dfe5b26ea0891b7d914f Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Sun, 22 Sep 2019 10:55:32 +0800
Subject: mail: Update certificate paths

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

(limited to 'roles')

diff --git a/roles/mail/templates/dovecot/dovecot.conf.j2 b/roles/mail/templates/dovecot/dovecot.conf.j2
index 1fde91b..5c59238 100644
--- a/roles/mail/templates/dovecot/dovecot.conf.j2
+++ b/roles/mail/templates/dovecot/dovecot.conf.j2
@@ -308,8 +308,8 @@ ssl = required
 # PEM encoded X.509 SSL/TLS certificate and private key.
 # They're opened before dropping root privileges, so preferred
 # permissions is: root:root, 0400.
-ssl_cert = </usr/local/etc/ssl/acme/{{ mydomain }}/fullchain.pem
-ssl_key = </usr/local/etc/ssl/acme/private/{{ mydomain }}.pem
+ssl_cert = <{{ web.ssl_root }}/{{ mydomain }}/fullchain
+ssl_key = <{{ web.ssl_root }}/{{ mydomain }}/key
 
 # DH parameters file.
 ssl_dh = </usr/local/etc/ssl/dhparam4096.pem
diff --git a/roles/mail/templates/postfix/main.cf.j2 b/roles/mail/templates/postfix/main.cf.j2
index cd7f4a1..e9e4a21 100644
--- a/roles/mail/templates/postfix/main.cf.j2
+++ b/roles/mail/templates/postfix/main.cf.j2
@@ -510,8 +510,8 @@ smtpd_tls_ask_ccert = yes
 
 # TLS certificate and key for this server (host)
 #
-smtpd_tls_cert_file = /usr/local/etc/ssl/acme/$mydomain/fullchain.pem
-smtpd_tls_key_file = /usr/local/etc/ssl/acme/private/$mydomain.pem
+smtpd_tls_cert_file = {{ web.ssl_root }}/$mydomain/fullchain
+smtpd_tls_key_file = {{ web.ssl_root }}/$mydomain/key
 
 # A CA bundle used by Postfix to validate remote servers' certificate.
 # NOTE: install package 'ca_root_nss'.
-- 
cgit v1.2.2