From 8e2f129a76237ba34743838b769023fc2b1fd118 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Wed, 2 Oct 2019 19:33:11 -0300
Subject: [PATCH] submission (dovecot) -> submission (postfix)

---
 defaults/main.yml | 6 ++++--
 tasks/main.yml    | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6d0ed22..fc900c9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -105,11 +105,13 @@ dovecot_quota_grace: 10%
 dovecot_submission_enable: yes
 dovecot_submission_hostname: "{{ dovecot_container }}.{{ docker_network }}"
 dovecot_submission_relay_host: postfix
-dovecot_submission_relay_port: 25
+dovecot_submission_relay_port: 587
 dovecot_submission_relay_trusted: yes
 # FIXME: add ssl/tls support
-dovecot_submission_relay_ssl: "no"
+dovecot_submission_relay_ssl: yes
 dovecot_submission_relay_ssl_verify: no
+dovecot_submission_relay_user: "%u"
+dovecot_submission_relay_password: "%w"
 
 # antispam
 dovecot_antispam_enable: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index c0a5224..d15cc20 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,10 +27,10 @@
       SUBMISSION_RELAY_PORT: "{{ dovecot_submission_relay_port | string }}"
       SUBMISSION_RELAY_TRUSTED: "{{ 'yes' if dovecot_submission_relay_trusted else 'no' }}"
       SUBMISSION_RELAY_SSL_VERIFY: "{{ 'yes' if dovecot_submission_relay_ssl_verify else 'no' }}"
-      SUBMISSION_RELAY_SSL: "{{ dovecot_submission_relay_ssl }}"
-      # SUBMISSION_RELAY_USER:
+      SUBMISSION_RELAY_SSL: "{{ 'yes' if dovecot_submission_relay_ssl else 'no' }}"
+      SUBMISSION_RELAY_USER: "{{ dovecot_submission_relay_user }}"
       # SUBMISSION_RELAY_MASTER_USER:
-      # SUBMISSION_RELAY_PASSWORD:
+      SUBMISSION_RELAY_PASSWORD: "{{ dovecot_submission_relay_password }}"
       # SUBMISSION_RELAY_RAWLOG_DIR:
       LDAP_ENABLE: "{{ 'yes' if dovecot_ldap_enable else '' }}"
       LDAP_HOSTS: "{{ dovecot_ldap_hosts | join(' ') }}"