diff options
-rw-r--r-- | roles/postfix_server/defaults/main.yml | 9 | ||||
-rw-r--r-- | roles/postfix_server/templates/etc/postfix/main.cf.j2 | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/roles/postfix_server/defaults/main.yml b/roles/postfix_server/defaults/main.yml index 3052a76..5234477 100644 --- a/roles/postfix_server/defaults/main.yml +++ b/roles/postfix_server/defaults/main.yml @@ -6,8 +6,11 @@ postfix_myorigin: '{{ email_domain }}' postfix_mynetworks: "{{ vlans.values() | map(attribute='cidr') }}" postfix_myhostname: '{{ ansible_fqdn }}' -postfix_virtual_transport: lmtp:inet:{{ imap_host }}:24 -postfix_mailbox_quota_service: inet:{{ imap_host }}:10993 -postfix_milter: inet:{{ rspamd_host }}:11332 +postfix_lmtp_host: '{{ imap_host }}' +postfix_lmtp_port: 24 +postfix_quota_host: '{{ postfix_lmtp_host }}' +postfix_quota_port: 10993 +postfix_rspamd_host: '{{ rspamd_host }}' +postfix_rspamd_port: 11332 postfix_recipient_group: role-imap-access diff --git a/roles/postfix_server/templates/etc/postfix/main.cf.j2 b/roles/postfix_server/templates/etc/postfix/main.cf.j2 index 9132dff..0c18175 100644 --- a/roles/postfix_server/templates/etc/postfix/main.cf.j2 +++ b/roles/postfix_server/templates/etc/postfix/main.cf.j2 @@ -95,15 +95,15 @@ smtpd_recipient_restrictions = reject_unauth_pipelining, reject_unlisted_recipient, reject_unauth_destination, - check_policy_service {{ postfix_mailbox_quota_service }} + check_policy_service inet:{{ postfix_quota_host }}:{{ postfix_quota_port }} smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining -virtual_transport = {{ postfix_virtual_transport }} +virtual_transport = lmtp:inet:{{ postfix_lmtp_host }}:{{ postfix_lmtp_port }} virtual_mailbox_domains = {{ freeipa_realm }} {{ postfix_virtual_domains | join(' ') }} virtual_mailbox_maps = ldap:$config_directory/virtual_mailboxes.cf virtual_alias_maps = ldap:$config_directory/virtual_aliases.cf milter_default_action = accept -smtpd_milters = {{ postfix_milter }} +smtpd_milters = inet:{{ postfix_rspamd_host }}:{{ postfix_rspamd_port }} |