From: Ralf Jung Date: Sun, 20 May 2018 20:59:37 +0000 (+0200) Subject: postfix: use default jinja combinator X-Git-Url: https://git.ralfj.de/ansible.git/commitdiff_plain/1eafda5361195d887ba73c0a88f033c91aa4ad23 postfix: use default jinja combinator --- diff --git a/roles/email/templates/master.cf b/roles/email/templates/master.cf index 1d3a3e8..fb582cb 100644 --- a/roles/email/templates/master.cf +++ b/roles/email/templates/master.cf @@ -9,7 +9,7 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (no) (never) (100) # ========================================================================== -{% if postfix.postscreen is defined and postfix.postscreen %} +{% if postfix.postscreen | default(False) %} smtp inet n - y - 1 postscreen smtpd pass - - y - - smtpd dnsblog unix - - y - 0 dnsblog @@ -17,14 +17,14 @@ tlsproxy unix - - y - 0 tlsproxy {% else %} smtp inet n - y - - smtpd {% endif %} -{% if postfix.smtpd_26 is defined and postfix.smtpd_26 %} +{% if postfix.smtpd_26 | default(False) %} 26 inet n - y - - smtpd -o syslog_name=postfix/smtpd2 -o smtpd_tls_security_level=encrypt -o smtpd_recipient_restrictions=permit_mynetworks,permit_tls_clientcerts,reject {% endif %} -{% if postfix.submission is defined and postfix.submission %} +{% if postfix.submission | default(False) %} submission inet n - y - - smtpd -o syslog_name=postfix/submission -o smtpd_tls_security_level=encrypt