confd #1

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

View File

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

View File

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

View File

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

View File

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