aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-02-02 14:06:09 +0100
committerAlex Auvolat <alex@adnab.me>2020-02-02 14:06:09 +0100
commitc8d29bf3dd536aa331f24aa2a142212c50ad18d8 (patch)
treed03e29f39078db7eb08bb05e3aff55ac942a1fb8
parentecbae866e17211c18e2f12271c58c5650e13a6b3 (diff)
downloadinfrastructure-c8d29bf3dd536aa331f24aa2a142212c50ad18d8.tar.gz
infrastructure-c8d29bf3dd536aa331f24aa2a142212c50ad18d8.zip
Mariadb & Seafile successfully using new Bottin
-rw-r--r--consul/configuration/bottin/config.json1
-rw-r--r--consul/configuration/mariadb/main/env.tpl2
-rw-r--r--consul/configuration/seafile/conf/ccnet.conf.sample2
-rw-r--r--nomad/bottin2.hcl2
4 files changed, 4 insertions, 3 deletions
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=<to be defined>,dc=deuxfleurs,dc=fr
FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr
diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl
index c1989bc..2f8068c 100644
--- a/nomad/bottin2.hcl
+++ b/nomad/bottin2.hcl
@@ -12,7 +12,7 @@ job "directory2" {
task "server" {
driver = "docker"
config {
- image = "lxpz/bottin_amd64:3"
+ image = "lxpz/bottin_amd64:6"
readonly_rootfs = true
port_map {
ldap_port = 1389