From 167ce351a9c6d1c381749220b5bda1fd4afe841c Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Tue, 10 Sep 2019 22:00:16 -0300
Subject: [PATCH] submission host

---
 defaults/main.yml                          | 3 ++-
 files/confd/conf.d/submission.toml         | 1 +
 files/confd/templates/submission.conf.tmpl | 1 +
 tasks/main.yml                             | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 86f9a42..4ed4b8c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,7 +15,7 @@ dovecot_volume_mail: dovecot_mail
 dovecot_volume_ssl: dovecot_ssl
 
 # nombre red docker (definido por rol docker)
-docker_network_name: dockernet
+docker_network: dockernet
 
 # Auth
 
@@ -103,6 +103,7 @@ dovecot_quota_grace: 10%
 
 # submission
 dovecot_submission_enable: yes
+dovecot_submission_host: "{{ dovecot_image }}.{{ docker_network }}"
 dovecot_submission_relay_host: postfix
 dovecot_submission_relay_port: 25
 dovecot_submission_relay_trusted: yes
diff --git a/files/confd/conf.d/submission.toml b/files/confd/conf.d/submission.toml
index ee8091b..e64578e 100644
--- a/files/confd/conf.d/submission.toml
+++ b/files/confd/conf.d/submission.toml
@@ -2,6 +2,7 @@
 src = "submission.conf.tmpl"
 dest = "/etc/dovecot/local.d/submission.conf"
 keys = [
+    "/submission/host",
     "/submission/relay/host",
     "/submission/relay/port",
     "/submission/relay/trusted",
diff --git a/files/confd/templates/submission.conf.tmpl b/files/confd/templates/submission.conf.tmpl
index 791783d..4ba1104 100644
--- a/files/confd/templates/submission.conf.tmpl
+++ b/files/confd/templates/submission.conf.tmpl
@@ -1,3 +1,4 @@
+submission_host = {{getv "/submission/host"}}
 submission_relay_host = {{getv "/submission/relay/host"}}
 submission_relay_port = {{getv "/submission/relay/port"}}
 submission_relay_trusted = {{getv "/submission/relay/trusted"}}
diff --git a/tasks/main.yml b/tasks/main.yml
index a1ed5c9..14cdb2f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -41,7 +41,7 @@
       - "{{ dovecot_volume_mail }}:/vmail/"
       - "{{ dovecot_volume_ssl }}:/ssl/"
     networks:
-      - name: "{{ docker_network_name }}"
+      - name: "{{ docker_network }}"
     ports: >-
       [ "143:143",
         {{ '"587:587",' if dovecot_submission_enable else '' }}
@@ -53,6 +53,7 @@
       AUTH_MECHANISMS: "{{ dovecot_auth_mechanisms }}"
       AUTH_USERNAME_FORMAT: "{{ dovecot_auth_username_format }}"
       AUTH_MASTER_ENABLE: "{{ 'yes' if dovecot_auth_master_enable else '' }}"
+      SUBMISSION_HOST: "{{ dovecot_submission_host }}"
       SUBMISSION_RELAY_HOST: "{{ dovecot_submission_relay_host }}"
       SUBMISSION_RELAY_PORT: "{{ dovecot_submission_relay_port | string }}"
       SUBMISSION_RELAY_TRUSTED: "{{ 'yes' if dovecot_submission_relay_trusted else 'no' }}"