diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-02-11 21:52:57 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-02-15 16:20:47 +0100 |
| commit | acdb34027b361cccfe6200ed8f087aa146d0ab55 (patch) | |
| tree | 2a5b77339c74b83b2d0f6b11919063e24dfc8acf /consul/configuration | |
| parent | ca787155c9f6b247ffc8718e963aad0fffeb5044 (diff) | |
| download | infrastructure-acdb34027b361cccfe6200ed8f087aa146d0ab55.tar.gz infrastructure-acdb34027b361cccfe6200ed8f087aa146d0ab55.zip | |
WIP: update mysql/seafile to use their own ldap user in ou=services
Diffstat (limited to 'consul/configuration')
| -rw-r--r-- | consul/configuration/.gitignore | 1 | ||||
| -rw-r--r-- | consul/configuration/seafile/conf/ccnet.conf (renamed from consul/configuration/seafile/conf/ccnet.conf.sample) | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/consul/configuration/.gitignore b/consul/configuration/.gitignore index 8c55cc6..d54ae44 100644 --- a/consul/configuration/.gitignore +++ b/consul/configuration/.gitignore @@ -10,6 +10,7 @@ # Whitelist specific files !seafile/conf/seafdav.conf +!seafile/conf/ccnet.conf !seafile/ccnet/seafile.ini !email/dkim/keytable diff --git a/consul/configuration/seafile/conf/ccnet.conf.sample b/consul/configuration/seafile/conf/ccnet.conf index 76f4da9..2395a9b 100644 --- a/consul/configuration/seafile/conf/ccnet.conf.sample +++ b/consul/configuration/seafile/conf/ccnet.conf @@ -1,6 +1,6 @@ [General] USER_NAME = deuxfleurs -ID = <to be defined> +ID = {{ key "secrets/seafile/ccnet/seafile_id" | trimSpace }} NAME = deuxfleurs SERVICE_URL = https://cloud.deuxfleurs.fr @@ -13,9 +13,9 @@ PORT = 13418 [LDAP] 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 +USER_DN = {{ key "secrets/seafile/ccnet/ldap_binddn" | trimSpace }} FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr -PASSWORD = <to be defined> +PASSWORD = {{ key "secrets/seafile/ccnet/ldap_bindpwd" | trimSpace }} LOGIN_ATTR = mail [Database] @@ -23,7 +23,7 @@ ENGINE = mysql HOST = mariadb.service.2.cluster.deuxfleurs.fr PORT = 3306 USER = seafile -PASSWD = <to be defined> +PASSWD = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }} DB = ccnet-db CONNECTION_CHARSET = utf8 |