From db957041629babff089bd3371988a0eb45bd2883 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 11 Aug 2020 17:47:21 +0200 Subject: [PATCH] Transform some options into variables. --- defaults/main.yml | 3 +++ templates/main.cf.j2 | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4199e2d..b7d9532 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,6 +19,9 @@ postfix_relay_client: False postfix_use_relay_host: '{{ postfix_relay_client }}' postfix_biff: "no" postfix_append_dot_mydomain: "no" +postfix_smtp_helo_required: "yes" +postfix_smtp_delay_reject: "yes" +postfix_smtp_disable_vrfy: "yes" postfix_use_letsencrypt: False postfix_tls_encryption_level: 'intermediate' diff --git a/templates/main.cf.j2 b/templates/main.cf.j2 index fa90939..52acddd 100644 --- a/templates/main.cf.j2 +++ b/templates/main.cf.j2 @@ -546,9 +546,9 @@ virtual_mailbox_limit = {{ postfix_message_size_limit }} # # UCE/RBL # -disable_vrfy_command = yes -smtpd_delay_reject = yes -smtpd_helo_required = yes +disable_vrfy_command = {{ postfix_smtp_disable_vrfy }} +smtpd_delay_reject = {{ postfix_smtp_delay_reject }} +smtpd_helo_required = {{ postfix_smtp_helo_required }} mailbox_size_limit = {{ postfix_message_size_limit }} message_size_limit = {{ postfix_message_size_limit }}