make letsencrypt optional for apache/postfix

[ansible.git] / roles / email / templates / main.cf

diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index dc72a19a73fbb65a39ab788a951964a4992b948a..eb6bdf1660b8c4e4dd5eebed4d8e8fe92ef1f947 100644 (file)
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -7,6 +7,7 @@ local_recipient_maps = $alias_maps
 mynetworks = {{ postfix.mynetworks }}
 {% endif %}
 
+{% if 'letsencrypt' in group_names %}
 # TLS server parameters
 smtpd_tls_cert_file=/etc/ssl/mycerts/letsencrypt/live.crt+chain
 smtpd_tls_key_file=/etc/ssl/private/letsencrypt/live.key
@@ -17,6 +18,7 @@ smtpd_tls_dh1024_param_file = /etc/ssl/dh2048.pem
 smtpd_tls_mandatory_protocols = !SSLv2 !SSLv3
 smtpd_tls_ciphers = low
 smtpd_tls_mandatory_ciphers = high
+{% endif %}
 # TLS client parameters
 smtp_tls_mandatory_protocols = !SSLv2 !SSLv3
 smtp_tls_ciphers = low
@@ -79,9 +81,10 @@ smtpd_tls_fingerprint_digest = sha1
 relay_clientcerts = hash:$config_directory/relay_clientcerts
 {% endif %}
 
-{% if postfix.virtual_mailbox_domains is defined %}
 # setup virtual delivery domains, aliases and destinations
-virtual_mailbox_domains ={% for item in postfix.virtual_mailbox_domains %} {{item.domain}}{% endfor %}
+virtual_mailbox_domains =
+{% if postfix.mailman is defined %}  {% for item in postfix.mailman.domains %} {{item}}{% endfor %}{% endif %}
+{% if postfix.dovecot is defined %}  {% for item in postfix.dovecot.domains %} {{item}}{% endfor %}{% endif %}
 
 virtual_alias_maps = hash:$config_directory/virtual_alias_map
   {% if postfix.dovecot is defined %}
@@ -108,6 +111,7 @@ proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_
 # setup mail routes for virtual mail: all mail ends up being forwarded somewhere
 virtual_transport = error
 transport_maps = hash:$config_directory/transport_map
+{% if postfix.mailman | default(False) %}
 mailman_destination_recipient_limit = 1
 {% endif %}