From 9815004324be1d2396ead81a7e8e02bffcfac47b Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 11 Feb 2020 22:57:31 +0100 Subject: [PATCH] Switch sogo to bottin2 with bottin2 upgrade & ACL fix --- consul/configuration/directory/bottin/config.json | 3 ++- consul/configuration/email/sogo/sogo.conf.tpl | 2 +- nomad/bottin2.hcl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/consul/configuration/directory/bottin/config.json b/consul/configuration/directory/bottin/config.json index ca49922..93d95c9 100644 --- a/consul/configuration/directory/bottin/config.json +++ b/consul/configuration/directory/bottin/config.json @@ -9,6 +9,7 @@ "cn=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*", "*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*", "ANONYMOUS::bind:*,ou=users,dc=deuxfleurs,dc=fr:", - "ANONYMOUS::bind:cn=admin,dc=deuxfleurs,dc=fr:" + "ANONYMOUS::bind:cn=admin,dc=deuxfleurs,dc=fr:", + "*,ou=services,ou=users,dc=deuxfleurs,dc=fr::bind:*,ou=users,dc=deuxfleurs,dc=fr:*" ] } diff --git a/consul/configuration/email/sogo/sogo.conf.tpl b/consul/configuration/email/sogo/sogo.conf.tpl index bb13a83..0b87db7 100644 --- a/consul/configuration/email/sogo/sogo.conf.tpl +++ b/consul/configuration/email/sogo/sogo.conf.tpl @@ -60,7 +60,7 @@ bindFields = (cn, mail); canAuthenticate = YES; displayName = "Bottin"; - hostname = "ldap://bottin.service.2.cluster.deuxfleurs.fr:389"; + hostname = "ldap://bottin2.service.2.cluster.deuxfleurs.fr:389"; id = bottin; isAddressBook = NO; } diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl index 5a1fa12..2851bc1 100644 --- a/nomad/bottin2.hcl +++ b/nomad/bottin2.hcl @@ -12,7 +12,7 @@ job "directory2" { task "bottin" { driver = "docker" config { - image = "lxpz/bottin_amd64:8" + image = "lxpz/bottin_amd64:10" readonly_rootfs = true port_map { ldap_port = 1389