diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-02-11 22:21:40 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-02-11 22:21:40 +0100 |
| commit | e700d146f032a824f1735ab31a28e2ac0f374629 (patch) | |
| tree | 8208e1d6dc421afa3646b19641d7215471593046 /consul | |
| parent | 3feb426e9f2a1ed790eb3932d81cb959bafc91d5 (diff) | |
| parent | 44a341f9a69e8d6ca2b9f4e4f8574d8d89668119 (diff) | |
| download | infrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.tar.gz infrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.zip | |
Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr
Diffstat (limited to 'consul')
| -rw-r--r-- | consul/configuration/.gitignore | 2 | ||||
| -rw-r--r-- | consul/configuration/directory/bottin/config.json (renamed from consul/configuration/bottin/config.json) | 1 | ||||
| -rw-r--r-- | consul/configuration/directory/guichet/config.json | 15 | ||||
| -rw-r--r-- | consul/configuration/mariadb/main/env.tpl | 2 | ||||
| -rw-r--r-- | consul/configuration/seafile/conf/ccnet.conf.sample | 2 |
5 files changed, 20 insertions, 2 deletions
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/directory/bottin/config.json index 3cd5e9d..ca49922 100644 --- a/consul/configuration/bottin/config.json +++ b/consul/configuration/directory/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/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" +} + 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=<to be defined>,dc=deuxfleurs,dc=fr FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr |