confd #1

Manually merged
mauro merged 30 commits from confd into master 2019-09-11 02:17:10 +00:00
5 changed files with 5 additions and 5 deletions
Showing only changes of commit 7361b77cd3 - Show all commits

View File

@ -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

View File

@ -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 \

View File

@ -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",

View File

@ -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"}}

View File

@ -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' }}"