From d5baf7cf88a3b8542b5b9743c11098076627b53c Mon Sep 17 00:00:00 2001 From: Farhad Shahbazi Date: Thu, 19 May 2016 14:40:40 +0200 Subject: [PATCH] add smtp_* options to postfix --- defaults/main.yml | 7 +++++-- templates/postfix/main.cf.j2 | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0ef1ce6..faabdc7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -68,8 +68,11 @@ common_postfix_mydestination: "{{ common_postfix_hostname }}, {{ ansible_hostnam common_postfix_mynetworks: "127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128" common_postfix_relay_domains: "{{ common_postfix_mydestination }}" common_postfix_relayhost: "" -common_postfix_smtpd_tls_security_level: False +common_postfix_smtp_tls_cert_file: +common_postfix_smtp_tls_key_file: +common_postfix_smtp_tls_security_level: "may" +common_postfix_smtp_tls_session_cache_database: "btree:${data_directory}/smtp_scache" common_postfix_smtpd_tls_cert_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem" common_postfix_smtpd_tls_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key" +common_postfix_smtpd_tls_security_level: False common_postfix_smtpd_tls_session_cache_database: "btree:${data_directory}/smtpd_scache" -common_postfix_smtp_tls_session_cache_database: "btree:${data_directory}/smtp_scache" diff --git a/templates/postfix/main.cf.j2 b/templates/postfix/main.cf.j2 index 1c0323f..ae5eb48 100644 --- a/templates/postfix/main.cf.j2 +++ b/templates/postfix/main.cf.j2 @@ -25,10 +25,16 @@ readme_directory = no {% if common_postfix_smtpd_tls_security_level %} # TLS parameters -smtpd_tls_security_level={{ common_postfix_smtpd_tls_security_level }} -smtpd_tls_cert_file={{ common_postfix_smtpd_tls_cert_file }} -smtpd_tls_key_file={{ common_postfix_smtpd_tls_key_file }} +smtpd_tls_security_level = {{ common_postfix_smtpd_tls_security_level }} +smtpd_tls_cert_file = {{ common_postfix_smtpd_tls_cert_file }} +smtpd_tls_key_file = {{ common_postfix_smtpd_tls_key_file }} smtpd_tls_session_cache_database = {{ common_postfix_smtpd_tls_session_cache_database }} +{% endif %} + +{% if common_postfix_smtp_tls_security_level %} +smtp_tls_security_level = {{ common_postfix_smtp_tls_security_level }} +smtp_tls_cert_file = {{ common_postfix_smtp_tls_cert_file }} +smtp_tls_key_file = {{ common_postfix_smtp_tls_key_file }} smtp_tls_session_cache_database = {{ common_postfix_smtp_tls_session_cache_database }} {% endif %}