From cd6da5d52f7e869c83e4a55bf762d9d6b0c96b09 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 11 Feb 2020 22:42:28 +0100 Subject: Switch dovecot to bottin2 & put secret in own consul key --- consul/configuration/email/dovecot/dovecot-ldap.conf.sample | 8 -------- consul/configuration/email/dovecot/dovecot-ldap.conf.tpl | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 consul/configuration/email/dovecot/dovecot-ldap.conf.sample create mode 100644 consul/configuration/email/dovecot/dovecot-ldap.conf.tpl (limited to 'consul/configuration/email') diff --git a/consul/configuration/email/dovecot/dovecot-ldap.conf.sample b/consul/configuration/email/dovecot/dovecot-ldap.conf.sample deleted file mode 100644 index 4848d6e..0000000 --- a/consul/configuration/email/dovecot/dovecot-ldap.conf.sample +++ /dev/null @@ -1,8 +0,0 @@ -hosts = bottin.service.2.cluster.deuxfleurs.fr -dn = cn=,dc=deuxfleurs,dc=fr -dnpass = -base = dc=deuxfleurs,dc=fr -scope = subtree -user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) -pass_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) -user_attrs = mail=/var/mail/%{ldap:mail} diff --git a/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl b/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl new file mode 100644 index 0000000..9fb1ea6 --- /dev/null +++ b/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl @@ -0,0 +1,8 @@ +hosts = bottin2.service.2.cluster.deuxfleurs.fr +dn = {{ key "secrets/email/dovecot/ldap_binddn" | trimSpace }} +dnpass = {{ key "secrets/email/dovecot/ldap_bindpwd" | trimSpace }} +base = dc=deuxfleurs,dc=fr +scope = subtree +user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) +pass_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) +user_attrs = mail=/var/mail/%{ldap:mail} -- cgit v1.2.3