From a46a165496e0ce4dc03766429c4840673956b421 Mon Sep 17 00:00:00 2001 From: psy Date: Fri, 29 Jan 2021 15:13:06 +0100 Subject: [PATCH] remove opendkim, add more general milter config --- defaults/main.yml | 2 ++ templates/main.cf.j2 | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d9c51c1..f3cf961 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -38,3 +38,5 @@ postfix: check_dovecot_quota: false postfixmaps: [] add_header_checks: [] + smtpd_milters: [] + non_smtpd_milters: [] \ No newline at end of file diff --git a/templates/main.cf.j2 b/templates/main.cf.j2 index 65908e4..f09e5b0 100644 --- a/templates/main.cf.j2 +++ b/templates/main.cf.j2 @@ -128,14 +128,9 @@ virtual_alias_maps = {{ postfix.virtual_alias_maps }} mime_header_checks = regexp:/etc/postfix/header_checks header_checks = regexp:/etc/postfix/header_checks - -# opendkim -{% if postfix.enable_opendkim %} - +# milter milter_protocol = 6 milter_default_action = accept -smtpd_milters = inet:localhost:8891 -non_smtpd_milters = inet:localhost:8891 - -{% endif %} \ No newline at end of file +smtpd_milters = {{ ' '.join(postfix.smtpd_milters) }} +non_smtpd_milters = {{ ' '.join(postfix.non_smtpd_milters) }}