From c8d29bf3dd536aa331f24aa2a142212c50ad18d8 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 2 Feb 2020 14:06:09 +0100 Subject: Mariadb & Seafile successfully using new Bottin --- consul/configuration/bottin/config.json | 1 + consul/configuration/mariadb/main/env.tpl | 2 +- consul/configuration/seafile/conf/ccnet.conf.sample | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'consul/configuration') diff --git a/consul/configuration/bottin/config.json b/consul/configuration/bottin/config.json index 3cd5e9d..ca49922 100644 --- a/consul/configuration/bottin/config.json +++ b/consul/configuration/bottin/config.json @@ -2,6 +2,7 @@ "suffix": "dc=deuxfleurs,dc=fr", "bind": "0.0.0.0:1389", "consul_host": "http://consul.service.2.cluster.deuxfleurs.fr:8500", + "log_level": "debug", "acl": [ "*,dc=deuxfleurs,dc=fr::read:*:* !userpassword", "*::read modify:SELF:*", diff --git a/consul/configuration/mariadb/main/env.tpl b/consul/configuration/mariadb/main/env.tpl index 5ac1b19..0fe903b 100644 --- a/consul/configuration/mariadb/main/env.tpl +++ b/consul/configuration/mariadb/main/env.tpl @@ -1,4 +1,4 @@ -LDAP_URI = "ldap://bottin.service.2.cluster.deuxfleurs.fr" +LDAP_URI = "ldap://bottin2.service.2.cluster.deuxfleurs.fr" LDAP_BASE = "ou=users,dc=deuxfleurs,dc=fr" LDAP_VERSION = 3 LDAP_BIND_DN = "{{ key "secrets/mariadb/main/ldap_binddn" | trimSpace }}" diff --git a/consul/configuration/seafile/conf/ccnet.conf.sample b/consul/configuration/seafile/conf/ccnet.conf.sample index 0c93bef..76f4da9 100644 --- a/consul/configuration/seafile/conf/ccnet.conf.sample +++ b/consul/configuration/seafile/conf/ccnet.conf.sample @@ -11,7 +11,7 @@ PORT = 10001 PORT = 13418 [LDAP] -HOST = ldap://bottin.service.2.cluster.deuxfleurs.fr/ +HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/ BASE = ou=users,dc=deuxfleurs,dc=fr USER_DN = cn=,dc=deuxfleurs,dc=fr FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr -- cgit v1.2.3 From 71767b52a5d35ba95b7dcad80b52239b68052d40 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 10 Feb 2020 17:49:53 +0100 Subject: Configuration de Guichet --- consul/configuration/.gitignore | 2 ++ consul/configuration/bottin/config.json | 14 -------------- consul/configuration/directory/bottin/config.json | 14 ++++++++++++++ consul/configuration/directory/guichet/config.json | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) delete mode 100644 consul/configuration/bottin/config.json create mode 100644 consul/configuration/directory/bottin/config.json create mode 100644 consul/configuration/directory/guichet/config.json (limited to 'consul/configuration') diff --git a/consul/configuration/.gitignore b/consul/configuration/.gitignore index bc3a54e..8c55cc6 100644 --- a/consul/configuration/.gitignore +++ b/consul/configuration/.gitignore @@ -25,3 +25,5 @@ !email/sogo/sogo.conf.tpl !chat/**/* + +!directory/*/* diff --git a/consul/configuration/bottin/config.json b/consul/configuration/bottin/config.json deleted file mode 100644 index ca49922..0000000 --- a/consul/configuration/bottin/config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "suffix": "dc=deuxfleurs,dc=fr", - "bind": "0.0.0.0:1389", - "consul_host": "http://consul.service.2.cluster.deuxfleurs.fr:8500", - "log_level": "debug", - "acl": [ - "*,dc=deuxfleurs,dc=fr::read:*:* !userpassword", - "*::read modify:SELF:*", - "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:" - ] -} diff --git a/consul/configuration/directory/bottin/config.json b/consul/configuration/directory/bottin/config.json new file mode 100644 index 0000000..ca49922 --- /dev/null +++ b/consul/configuration/directory/bottin/config.json @@ -0,0 +1,14 @@ +{ + "suffix": "dc=deuxfleurs,dc=fr", + "bind": "0.0.0.0:1389", + "consul_host": "http://consul.service.2.cluster.deuxfleurs.fr:8500", + "log_level": "debug", + "acl": [ + "*,dc=deuxfleurs,dc=fr::read:*:* !userpassword", + "*::read modify:SELF:*", + "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:" + ] +} diff --git a/consul/configuration/directory/guichet/config.json b/consul/configuration/directory/guichet/config.json new file mode 100644 index 0000000..9dde56a --- /dev/null +++ b/consul/configuration/directory/guichet/config.json @@ -0,0 +1,15 @@ +{ + "http_bind_addr": ":9991", + "ldap_server_addr": "ldap://bottin2.service.2.cluster.deuxfleurs.fr:389", + + "base_dn": "dc=deuxfleurs,dc=fr", + "user_base_dn": "ou=users,dc=deuxfleurs,dc=fr", + "user_name_attr": "cn", + "group_base_dn": "ou=groups,dc=deuxfleurs,dc=fr", + "group_name_attr": "cn", + + "admin_account": "cn=admin,dc=deuxfleurs,dc=fr", + "group_can_admin": "cn=admin,ou=groups,dc=deuxfleurs,dc=fr", + "group_can_invite": "cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr" +} + -- cgit v1.2.3