unbound: make sure unbound is loaded before the network is considered online

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

diff --git a/roles/postfix/templates/main.cf b/roles/postfix/templates/main.cf
index 40859557ce85a484d9e1a2823a7643de04832037..fa2082c630f3a2260e12857255a1f252d162f285 100644 (file)
--- a/roles/postfix/templates/main.cf
+++ b/roles/postfix/templates/main.cf
@@ -1,8 +1,8 @@
+compatibility_level = 2
+

 # local delivery: aliases only
 alias_maps = hash:/etc/aliases
 local_recipient_maps = $alias_maps
 # local delivery: aliases only
 alias_maps = hash:/etc/aliases
 local_recipient_maps = $alias_maps

-# only consider ourselves local
-mynetworks_style = host

 {% if postfix.mynetworks is defined %}
 mynetworks = {{ postfix.mynetworks }}
 {% endif %}
 {% if postfix.mynetworks is defined %}
 mynetworks = {{ postfix.mynetworks }}
 {% endif %}


@@ -13,7 +13,7 @@ smtpd_tls_key_file=/etc/ssl/private/letsencrypt/live.key
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtpd_tls_security_level = may
 smtpd_tls_loglevel = 1
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtpd_tls_security_level = may
 smtpd_tls_loglevel = 1

-smtpd_tls_dh1024_param_file = /etc/ssl/dh2048.pem
+smtpd_tls_dh1024_param_file = {{ postfix.paths.dh2048 }}

 smtpd_tls_mandatory_protocols = !SSLv2 !SSLv3
 smtpd_tls_ciphers = low
 smtpd_tls_mandatory_ciphers = high
 smtpd_tls_mandatory_protocols = !SSLv2 !SSLv3
 smtpd_tls_ciphers = low
 smtpd_tls_mandatory_ciphers = high


@@ -27,18 +27,7 @@ smtp_tls_security_level = dane
 smtp_dns_support_level = dnssec
 {% endif %}
 
 smtp_dns_support_level = dnssec
 {% endif %}
 

-{% if postfix.relay_host is defined %}
-# Relay everything
-default_transport = smtp:{{ postfix.relay_host }}
-{% if postfix.relay_client_cert is defined %}
-# Enforce relay encryption
-smtp_tls_cert_file=$config_directory/{{ postfix.relay_client_cert }}.crt
-smtp_tls_key_file=$config_directory/{{ postfix.relay_client_cert }}.key
-smtp_tls_security_level = encrypt
-{% endif %}
-{% endif %}
-
-{% if postfix.postscreen is defined and postfix.postscreen %}
+{% if postfix.postscreen | default(False) %}

 # postscreen config
 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_whitelist_threshold = -2
 # postscreen config
 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_whitelist_threshold = -2


@@ -66,10 +55,72 @@ smtpd_recipient_restrictions = permit_mynetworks, permit_tls_clientcerts,
     reject_non_fqdn_recipient,
     reject_non_fqdn_sender,
 
     reject_non_fqdn_recipient,
     reject_non_fqdn_sender,
 

+{% if postfix.relay_host is defined %}
+# Relay everything
+default_transport = smtp:{{ postfix.relay_host }}
+{% if postfix.relay_client_cert is defined %}
+# Enforce relay encryption
+smtp_tls_cert_file=$config_directory/{{ postfix.relay_client_cert }}.crt
+smtp_tls_key_file=$config_directory/{{ postfix.relay_client_cert }}.key
+smtp_tls_security_level = encrypt
+{% endif %}
+{% endif %}
+
+{% if postfix.submission | default(False) %}
+# configure SASL
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = private/auth
+{% endif %}
+
+{% if postfix.relay_client_cert_whitelist is defined %}
+# allow relay for some TLS-authenticated clients
+smtpd_tls_ask_ccert = yes
+smtpd_tls_fingerprint_digest = sha1
+relay_clientcerts = hash:$config_directory/{{ postfix.relay_client_cert_whitelist }}
+{% endif %}
+
+{% if postfix.virtual_mailbox_domains is defined %}
+# setup virtual delivery domains, aliases and destinations
+virtual_mailbox_domains = {{ postfix.virtual_mailbox_domains }}
+virtual_alias_maps = hash:$config_directory/virtual_alias_map
+  {% if postfix.vmail_mysql_password is defined %}
+  proxy:mysql:$config_directory/mysql_vmail_aliases.cf
+  {% endif %}
+#
+virtual_mailbox_maps =
+  {% if postfix.vmail_mysql_password is defined %}
+  proxy:mysql:$config_directory/mysql_vmail_users.cf
+  {% endif %}
+  {% if postfix.mailman | default(False) %}
+  hash:/var/lib/mailman/data/virtual-mailman
+  {% endif %}
+#
+smtpd_sender_login_maps =
+  {% if postfix.vmail_mysql_password is defined %}
+  proxy:mysql:$config_directory/mysql_vmail_users.cf
+  proxy:mysql:$config_directory/mysql_vmail_senders.cf
+  proxy:mysql:$config_directory/mysql_vmail_aliases.cf
+  {% endif %}
+#
+proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_maps
+
+# setup mail routes for virtual mail: all mail ends up being forwarded somewhere
+virtual_transport = error
+transport_maps = hash:/etc/postfix/transport_map
+mailman_destination_recipient_limit = 1
+{% endif %}
+
+{% if postfix.opendkim is defined %}
+# DKIM & Milter
+milter_default_action = accept
+# Path must match opendkim.env
+smtpd_milters = unix:opendkim/sock
+non_smtpd_milters = $smtpd_milters
+{% endif %}
+

 # misc
 smtpd_delay_reject = yes
 disable_vrfy_command = yes
 recipient_delimiter = +
 delay_warning_time = 4h
 message_size_limit = 21384000
 # misc
 smtpd_delay_reject = yes
 disable_vrfy_command = yes
 recipient_delimiter = +
 delay_warning_time = 4h
 message_size_limit = 21384000

-append_dot_mydomain = no