From d7036efd6a327016990d352484a4ed8659017872 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Fri, 1 Jan 2021 16:50:53 +0100
Subject: [PATCH] postfix: fix transport maps and smtpd tls level
---
postfix/tasks/main.yml | 2 +-
postfix/templates/main.cf.j2 | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/postfix/tasks/main.yml b/postfix/tasks/main.yml
index 872df6c..0522055 100644
--- a/postfix/tasks/main.yml
+++ b/postfix/tasks/main.yml
@@ -127,7 +127,7 @@
dest: /etc/postfix/transport
notify:
- postmap transport
- when: postfix_transport_maps|bool
+ when: postfix_transport_maps|count > 0
tags:
- postfix
- mail
diff --git a/postfix/templates/main.cf.j2 b/postfix/templates/main.cf.j2
index 4478017..a56e2e4 100644
--- a/postfix/templates/main.cf.j2
+++ b/postfix/templates/main.cf.j2
@@ -7,7 +7,7 @@ myorigin = /etc/mailname
mydestination = $myhostname localhost {{ postfix_domains | join(" ") }}
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ postfix_my_networks|join(" ") }}
relayhost = {{ postfix_relay_host }}
-{% if postfix_transport_maps|bool %}
+{% if postfix_transport_maps|count > 0 %}
transport_maps = cdb:/etc/postfix/transport
{% endif %}
@@ -59,7 +59,6 @@ recipient_canonical_maps = tcp:127.0.0.1:10002
recipient_canonical_classes= envelope_recipient,header_recipient
{% endif %}
-smtpd_use_tls = yes
smtp_tls_security_level = may
smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
smtpd_tls_security_level = may
--
GitLab