From 7361b77cd3d5d791d0799f492979b47092052fe1 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Tue, 10 Sep 2019 22:31:18 -0300
Subject: [PATCH] submission hostname

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

diff --git a/defaults/main.yml b/defaults/main.yml
index ff4eeb2..f44a53b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -103,7 +103,7 @@ dovecot_quota_grace: 10%
 
 # submission
 dovecot_submission_enable: yes
-dovecot_submission_host: "{{ dovecot_container }}.{{ docker_network }}"
+dovecot_submission_hostname: "{{ dovecot_container }}.{{ docker_network }}"
 dovecot_submission_relay_host: postfix
 dovecot_submission_relay_port: 25
 dovecot_submission_relay_trusted: yes
diff --git a/files/Dockerfile b/files/Dockerfile
index a97697b..aa29949 100644
--- a/files/Dockerfile
+++ b/files/Dockerfile
@@ -7,7 +7,7 @@ ENV \
     AUTH_MECHANISMS=plain \
     AUTH_USERNAME_FORMAT="%Lu" \
     AUTH_MASTER_ENABLE= \
-    SUBMISSION_HOST=dovecot.dockernet \
+    SUBMISSION_HOSTNAME=dovecot.dockernet \
     SUBMISSION_RELAY_HOST= \
     SUBMISSION_RELAY_PORT=25 \
     SUBMISSION_RELAY_TRUSTED=yes \
diff --git a/files/confd/conf.d/submission.toml b/files/confd/conf.d/submission.toml
index e64578e..51b822d 100644
--- a/files/confd/conf.d/submission.toml
+++ b/files/confd/conf.d/submission.toml
@@ -2,7 +2,7 @@
 src = "submission.conf.tmpl"
 dest = "/etc/dovecot/local.d/submission.conf"
 keys = [
-    "/submission/host",
+    "/submission/hostname",
     "/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 4ba1104..9ea4426 100644
--- a/files/confd/templates/submission.conf.tmpl
+++ b/files/confd/templates/submission.conf.tmpl
@@ -1,4 +1,4 @@
-submission_host = {{getv "/submission/host"}}
+hostname = {{getv "/submission/hostname"}}
 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 14cdb2f..69e2881 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -53,7 +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_HOSTNAME: "{{ dovecot_submission_hostname }}"
       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' }}"