From 0c8247d4a2adca5883251ced1c7a8a4ea9bc0bf5 Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Sun, 27 Dec 2020 19:59:52 +0100
Subject: [PATCH] [dovecot] Fix ldap queries.
---
group_vars/dovecot.yml | 1 +
roles/dovecot/templates/dovecot/conf.d/10-master.conf.j2 | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/group_vars/dovecot.yml b/group_vars/dovecot.yml
index d10d9458..50edaf23 100644
--- a/group_vars/dovecot.yml
+++ b/group_vars/dovecot.yml
@@ -1,2 +1,3 @@
glob_dovecot:
ldap_dn: 'cn=dovecot,ou=service-users,dc=crans,dc=org'
+ inet_listener: "{{ query('ldap', 'ip', ansible_hostname, 'adm') | ipwrap | join(', ') }}"
diff --git a/roles/dovecot/templates/dovecot/conf.d/10-master.conf.j2 b/roles/dovecot/templates/dovecot/conf.d/10-master.conf.j2
index 52cadacf..f4b4e437 100644
--- a/roles/dovecot/templates/dovecot/conf.d/10-master.conf.j2
+++ b/roles/dovecot/templates/dovecot/conf.d/10-master.conf.j2
@@ -16,7 +16,7 @@ default_process_limit = 500
service imap-login {
inet_listener imap {
- address = 127.0.0.1, {{ query('ldap', 'ip', inventory_hostname, 'adm') | ipwrap }}
+ address = 127.0.0.1, {{ dovecot.inet_listener }}
port = 143
}
inet_listener imaps {
@@ -39,7 +39,7 @@ service imap-login {
service pop3-login {
inet_listener pop3 {
- address = 127.0.0.1, {{ query('ldap', 'ip', inventory_hostname, 'adm') | ipwrap }}
+ address = 127.0.0.1, {{ dovecot.inet_listener }}
port = 110
}
inet_listener pop3s {
--
GitLab