From 04516a9ab247b3b575be0352d0d59faa7b8d3538 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Sun, 8 Sep 2019 14:32:18 -0300
Subject: [PATCH] log a stdout, uris ldap, puerto auth

---
 defaults/main.yml                  | 5 ++---
 files/10-master.conf               | 6 +++---
 files/Dockerfile                   | 2 ++
 files/local.conf                   | 1 +
 tasks/main.yml                     | 1 +
 templates/dovecot-ldap.conf.ext.j2 | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 files/local.conf

diff --git a/defaults/main.yml b/defaults/main.yml
index 6257065..5ba7f17 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,7 +17,6 @@ dovecot_volume_ssl: dovecot_ssl
 # nombre red docker (definido por rol docker)
 docker_network_name: dockernet
 
-
 # Auth
 
 # mecanismos de autenticacion: agregar login para compat. outlook
@@ -38,8 +37,8 @@ dovecot_auth_master_enable: no
 dovecot_ldap_enable: yes
 
 # servidores ldap
-dovecot_ldap_servers:
-  - localhost
+dovecot_ldap_uris:
+  - "{{ ldap_uri | default('ldap://localhost') }}"
 
 # version del protocolo LDAP
 dovecot_ldap_version: 3
diff --git a/files/10-master.conf b/files/10-master.conf
index c04c84d..d5c907b 100644
--- a/files/10-master.conf
+++ b/files/10-master.conf
@@ -92,9 +92,9 @@ service auth {
     #group = 
   }
 
-  # inet_listener {
-  #   port = 12345
-  # }
+  inet_listener {
+    port = 12345
+  }
 
   # Auth process is run as this user.
   #user = $default_internal_user
diff --git a/files/Dockerfile b/files/Dockerfile
index e8a350d..224f5bf 100644
--- a/files/Dockerfile
+++ b/files/Dockerfile
@@ -31,6 +31,8 @@ ADD 10-mail.conf \
   auth-master.conf.ext \
   /etc/dovecot/conf.d/
 
+ADD local.conf /etc/dovecot/
+
 ADD junk-filter.sieve /etc/dovecot/sieve/before/
 RUN sievec /etc/dovecot/sieve/before && sievec /etc/dovecot/sieve/after
 
diff --git a/files/local.conf b/files/local.conf
new file mode 100644
index 0000000..387553e
--- /dev/null
+++ b/files/local.conf
@@ -0,0 +1 @@
+log_path = /dev/stdout
diff --git a/tasks/main.yml b/tasks/main.yml
index 13d084a..1d1ed41 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,6 +22,7 @@
     - auth-ldap.conf.ext
     - auth-master.conf.ext
     - junk-filter.sieve
+    - local.conf
   tags: skip_me
 
 - name: Crear imagen {{ dovecot_image }}
diff --git a/templates/dovecot-ldap.conf.ext.j2 b/templates/dovecot-ldap.conf.ext.j2
index 765f631..4d994db 100644
--- a/templates/dovecot-ldap.conf.ext.j2
+++ b/templates/dovecot-ldap.conf.ext.j2
@@ -5,7 +5,8 @@
 # http://wiki2.dovecot.org/AuthDatabase/LDAP
 
 # Space separated list of LDAP hosts to use. host:port is allowed too.
-hosts = {{ dovecot_ldap_servers | join(" ") }}
+# hosts = {{ dovecot_ldap_servers | join(" ") }}
+uris = {{ dovecot_ldap_uris | join(" ") }}
 
 # Use authentication binding for verifying password's validity. This works by
 # logging into LDAP server using the username and password given by client.