diff options
| author | Alex <alex@adnab.me> | 2020-02-15 16:23:00 +0100 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2020-02-15 16:23:00 +0100 |
| commit | c49647e95e2658894ec422495a0cdd56480473d3 (patch) | |
| tree | aed6c827b65119c29ee41e9396165332f1c64590 /consul | |
| parent | ca787155c9f6b247ffc8718e963aad0fffeb5044 (diff) | |
| parent | afaf89f7512036318bd7a187c91e19601b7470d6 (diff) | |
| download | infrastructure-c49647e95e2658894ec422495a0cdd56480473d3.tar.gz infrastructure-c49647e95e2658894ec422495a0cdd56480473d3.zip | |
Merge branch 'wip_seafile' of Deuxfleurs/deuxfleurs.fr into master
Diffstat (limited to 'consul')
| -rw-r--r-- | consul/configuration/seafile/conf/ccnet.conf.tpl (renamed from consul/configuration/seafile/conf/ccnet.conf.sample) | 8 | ||||
| -rw-r--r-- | consul/configuration/seafile/conf/seafile.conf.tpl (renamed from consul/configuration/seafile/conf/seafile.conf.sample) | 2 | ||||
| -rw-r--r-- | consul/configuration/seafile/conf/seahub_settings.py.tpl (renamed from consul/configuration/seafile/conf/seahub_settings.py.sample) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/consul/configuration/seafile/conf/ccnet.conf.sample b/consul/configuration/seafile/conf/ccnet.conf.tpl index 76f4da9..2395a9b 100644 --- a/consul/configuration/seafile/conf/ccnet.conf.sample +++ b/consul/configuration/seafile/conf/ccnet.conf.tpl @@ -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 diff --git a/consul/configuration/seafile/conf/seafile.conf.sample b/consul/configuration/seafile/conf/seafile.conf.tpl index cfe3592..f224234 100644 --- a/consul/configuration/seafile/conf/seafile.conf.sample +++ b/consul/configuration/seafile/conf/seafile.conf.tpl @@ -11,7 +11,7 @@ type = mysql host = mariadb.service.2.cluster.deuxfleurs.fr port = 3306 user = seafile -password = <to be defined> +password = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }} db_name = seafile-db connection_charset = utf8 diff --git a/consul/configuration/seafile/conf/seahub_settings.py.sample b/consul/configuration/seafile/conf/seahub_settings.py.tpl index 06aa7d3..6c63ee4 100644 --- a/consul/configuration/seafile/conf/seahub_settings.py.sample +++ b/consul/configuration/seafile/conf/seahub_settings.py.tpl @@ -5,7 +5,7 @@ DATABASES = { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'seahub-db', 'USER': 'seafile', - 'PASSWORD': '<to be defined>', + 'PASSWORD': '{{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}', 'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr', 'PORT': '3306', 'OPTIONS': { |