Merge branch 'master' of adellam/ansible-roles into master

This commit is contained in:
Andrea Dell'Amico 2020-01-25 13:58:46 +01:00 committed by Gitea
commit 8c790c8547
1 changed files with 5 additions and 2 deletions

View File

@ -177,8 +177,10 @@ mydestination = {{ ansible_fqdn }}, localhost
#
#local_recipient_maps = unix:passwd.byname $alias_maps
#local_recipient_maps = proxy:unix:passwd.byname $alias_maps
{% if not postfix_local_recipients %}
{% if postfix_virtual_transport_enabled %}
local_recipient_maps =
{% elif not postfix_local_recipients %}
#local_recipient_maps =
{% endif %}
# The unknown_local_recipient_reject_code specifies the SMTP server
@ -347,6 +349,7 @@ relayhost = {{ postfix_relay_host }}:{{ postfix_relay_port }}
transport_maps = {% for tmap in postfix_transport_maps %}{{ tmap }}{% if not loop.last %}, {% endif %}{% endfor %}
{% endif %}
# ALIAS DATABASE
#
# The alias_maps parameter specifies the list of alias databases used
@ -490,7 +493,7 @@ virtual_mailbox_maps = {% for mbmap in postfix_virtual_mailbox_maps %}{{ mbmap }
{% endif %}
{% if postfix_virtual_domains %}
virtual_alias_domains = = {{ postfix_virtual_alias_domains }}
virtual_alias_domains = {{ postfix_virtual_alias_domains }}
{% endif %}
{% if postfix_virtual_addresses %}
virtual_alias_maps = {% for mbmap in postfix_virtual_alias_maps %}{{ mbmap }} {% endfor %}