diff --git a/defaults/main.yml b/defaults/main.yml index 0be12fe..7b51800 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # nombre imagen -postfix_image: my_postfix +postfix_image: eumau/postfix # nombre container postfix_container: postfix @@ -11,6 +11,9 @@ postfix_volume: postfix # nombre de la red docker, seteado por rol docker docker_network_name: dockernet +# nombre del container dovecot, seteado por rol dovecot +dovecot_container: dovecot + # puertos públicos postfix_publish_ports: - 25 diff --git a/files/11-postfix.conf b/files/11-postfix.conf deleted file mode 100644 index 522f162..0000000 --- a/files/11-postfix.conf +++ /dev/null @@ -1,23 +0,0 @@ -# LMTP delivery service for Postfix -service lmtp { - unix_listener /var/spool/postfix/private/dovecot-lmtp { - mode = 0600 - group = postfix - user = postfix - } - -service lmtp { - inet_listener lmtp { - address = 192.168.0.24 127.0.0.1 ::1 - port = 24 - } -} - -# Authentication service for Postfix -service auth { - unix_listener /var/spool/postfix/private/auth { - mode = 0660 - user = postfix - group = postfix - } -} diff --git a/tasks/main.yml b/tasks/main.yml index 72341b0..6efde70 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -138,14 +138,11 @@ {% elif p == "file" %} hash:/etc/postfix/{{ d }}_users {% endif %}{{ '' if loop.last else ',' }}{% endfor %}, - # FIXME usar container dovecot - # virtual_transport: - # lmtp:unix:private/dovecot-lmtp + virtual_transport: "{{ dovecot_container }}:24" virtual_mailbox_domains: "{{ postfix_mail_domains }}" - # FIXME usar container dovecot - # smtpd_sasl_path: private/auth - # smtpd_sasl_type: dovecot + smtpd_sasl_path: "inet:{{ dovecot_container }}:12345" + smtpd_sasl_type: dovecot smtpd_sasl_auth_enable: "{{ 'yes' if postfix_enable_smtpd_auth else 'no' }}" smtpd_tls_cert_file: