From 6dc7aa2d1832a49b6cd998093e43deb2c15dd014 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 3 Sep 2017 14:31:09 +0200
Subject: [PATCH] dovecot/postfix: Fix SSL domain
Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
roles/dovecot/templates/dovecot.conf.j2 | 4 ++--
roles/postfix/defaults/main.yml | 2 ++
roles/postfix/templates/main.cf.j2 | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/roles/dovecot/templates/dovecot.conf.j2 b/roles/dovecot/templates/dovecot.conf.j2
index ba4ca27f6..c1e7259ce 100644
--- a/roles/dovecot/templates/dovecot.conf.j2
+++ b/roles/dovecot/templates/dovecot.conf.j2
@@ -83,8 +83,8 @@ service lmtp {
login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k"
-ssl_cert = </etc/letsencrypt/live/{{inventory_hostname}}/fullchain.pem
-ssl_key = </etc/letsencrypt/live/{{inventory_hostname}}/privkey.pem
+ssl_cert = </etc/letsencrypt/live/{{mail_domain}}/fullchain.pem
+ssl_key = </etc/letsencrypt/live/{{mail_domain}}/privkey.pem
ssl_prefer_server_ciphers = yes
ssl_protocols = !SSLv3
ssl_options = no_compression
diff --git a/roles/postfix/defaults/main.yml b/roles/postfix/defaults/main.yml
index b7bdf7135..77339e945 100644
--- a/roles/postfix/defaults/main.yml
+++ b/roles/postfix/defaults/main.yml
@@ -5,3 +5,5 @@ postfix_server: false
postfix_patchwork_enabled: false
postfix_patchwork_user: "patchwork"
postfix_patchwork_mail_handler: "/usr/local/bin/patchwork-parsemail-wrapper.sh"
+
+mail_domain: "mail.archlinux.org"
diff --git a/roles/postfix/templates/main.cf.j2 b/roles/postfix/templates/main.cf.j2
index 5ca368969..b40d673f4 100644
--- a/roles/postfix/templates/main.cf.j2
+++ b/roles/postfix/templates/main.cf.j2
@@ -6,8 +6,8 @@ biff = no
append_dot_mydomain = no
{% if postfix_smtpd_public %}
-smtpd_tls_cert_file = /etc/letsencrypt/live/{{inventory_hostname}}/fullchain.pem
-smtpd_tls_key_file = /etc/letsencrypt/live/{{inventory_hostname}}/privkey.pem
+smtpd_tls_cert_file = /etc/letsencrypt/live/{{mail_domain}}/fullchain.pem
+smtpd_tls_key_file = /etc/letsencrypt/live/{{mail_domain}}/privkey.pem
{% endif %}
smtpd_tls_dh1024_param_file = /etc/postfix/dh2048.pem
--
GitLab