diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-02-11 22:57:31 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-02-11 23:19:53 +0100 |
| commit | 9815004324be1d2396ead81a7e8e02bffcfac47b (patch) | |
| tree | b4a544a0e83d18a2854c85c3e1c6f9741577d0c7 | |
| parent | cd6da5d52f7e869c83e4a55bf762d9d6b0c96b09 (diff) | |
| download | infrastructure-9815004324be1d2396ead81a7e8e02bffcfac47b.tar.gz infrastructure-9815004324be1d2396ead81a7e8e02bffcfac47b.zip | |
Switch sogo to bottin2 with bottin2 upgrade & ACL fix
| -rw-r--r-- | consul/configuration/directory/bottin/config.json | 3 | ||||
| -rw-r--r-- | consul/configuration/email/sogo/sogo.conf.tpl | 2 | ||||
| -rw-r--r-- | 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 |