mejoras generales

tasks/main.yml

@@ -11,24 +11,16 @@
     dest: /root/.dovecot-docker-image
   loop:
     - Dockerfile
-    - 10-auth.conf.tmpl
     - 10-mail.conf
     - 10-master.conf
     - 10-ssl.conf
     - 15-mailboxes.conf
     - 20-imap.conf
-    - 20-lmtp.conf.tmpl
     - 90-antispam.conf
     - 90-sieve.conf
-    - ldap.conf.ext.tmpl
     - junk-filter.sieve
     - local.conf
-    - submission.conf.tmpl
-    - confd-auth.toml
-    - confd-ldap.toml
-    - confd-ldap2.toml
-    - confd-lmtp.toml
-    - confd-submission.toml
+    - confd
   tags: skip_me
 
 - name: Crear imagen {{ dovecot_image }}
@@ -50,25 +42,27 @@
       - "{{ dovecot_volume_ssl }}:/ssl/"
     networks:
       - name: "{{ docker_network_name }}"
-    ports:
-      - 143:143
-      - 2000:2000
+    ports: >-
+      [ "143:143",
+        {{ '"587:587",' if dovecot_submission_enable else '' }}
+        "2000:2000"
+      ]
+
     env:
       MAIL_DOMAINS: "{{ mail_domains.keys() | list | join(' ') }}"
       AUTH_MECHANISMS: "{{ dovecot_auth_mechanisms }}"
       AUTH_USERNAME_FORMAT: "{{ dovecot_auth_username_format }}"
-      AUTH_LDAP_ENABLE: "{{ 'yes' if dovecot_ldap_enable else '' }}"
       AUTH_MASTER_ENABLE: "{{ 'yes' if dovecot_auth_master_enable else '' }}"
-      SUBMISSION_ENABLE: "yes"
-      SUBMISSION_RELAY_HOST: postfix
-      SUBMISSION_RELAY_PORT: "25"
-      SUBMISSION_RELAY_TRUSTED: "yes"
+      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' }}"
       # SUBMISSION_RELAY_USER:
       # SUBMISSION_RELAY_MASTER_USER:
       # SUBMISSION_RELAY_PASSWORD:
       # SUBMISSION_RELAY_SSL: starttls
       # SUBMISSION_RELAY_SSL_VERIFY: "no"
       # SUBMISSION_RELAY_RAWLOG_DIR:
+      LDAP_ENABLE: "{{ 'yes' if dovecot_ldap_enable else '' }}"
       LDAP_HOSTS: "{{ dovecot_ldap_hosts | join(' ') }}"
       LDAP_URIS: "{{ dovecot_ldap_uris | join(' ') }}"
       LDAP_BIND: "{{ 'yes' if dovecot_ldap_bind else 'no' }}"