From cf897f8c1941d30a366d1e91cb7dd5e974a9fb44 2015-04-07 23:01:21 From: Branko Majic Date: 2015-04-07 23:01:21 Subject: [PATCH] MAR-4: Updated formatting for Postfix main.cf. --- diff --git a/roles/mail_server/templates/main.cf.j2 b/roles/mail_server/templates/main.cf.j2 index 44a6a33564e2681e50eed0b03a991e672e47a5a8..fc8e6903b78b32ce33b08ba3de82c14a93cb7cab 100644 --- a/roles/mail_server/templates/main.cf.j2 +++ b/roles/mail_server/templates/main.cf.j2 @@ -40,20 +40,22 @@ recipient_delimiter = + inet_interfaces = all # LDAP directory look-ups for domains, mailboxes and aliases. -virtual_mailbox_domains=ldap:/etc/postfix/ldap-virtual-mailbox-domains.cf -virtual_mailbox_maps=ldap:/etc/postfix/ldap-virtual-mailbox-maps.cf -virtual_alias_maps=ldap:/etc/postfix/ldap-virtual-alias-maps.cf +virtual_mailbox_domains = ldap:/etc/postfix/ldap-virtual-mailbox-domains.cf +virtual_mailbox_maps = ldap:/etc/postfix/ldap-virtual-mailbox-maps.cf +virtual_alias_maps = ldap:/etc/postfix/ldap-virtual-alias-maps.cf # Delivery of mails via Dovecot for virtual domains. -virtual_transport=dovecot -dovecot_destination_recipient_limit=1 +virtual_transport = dovecot +dovecot_destination_recipient_limit = 1 # SMTP authentication. -smtpd_sasl_type=dovecot -smtpd_sasl_path=private/auth -smtpd_sasl_auth_enable=yes -smtpd_tls_security_level=may -smtpd_tls_auth_only=yes -smtpd_tls_cert_file={{ smtp_tls_certificate }} -smtpd_tls_key_file={{ smtp_tls_key }} -smtpd_recipient_restrictions=permit_mynetworks permit_sasl_authenticated reject_unauth_destination +smtpd_sasl_type = dovecot +smtpd_sasl_path = private/auth +smtpd_sasl_auth_enable = yes +smtpd_tls_security_level = may +smtpd_tls_auth_only = yes +smtpd_tls_cert_file = {{ smtp_tls_certificate }} +smtpd_tls_key_file = {{ smtp_tls_key }} +smtpd_recipient_restrictions = permit_mynetworks + permit_sasl_authenticated + reject_unauth_destination