KokaKiwi/infrastructure
1
0
Fork 0
forked from Deuxfleurs/infrastructure
Code Issues Pull requests Projects Releases Wiki Activity

WIP: update mysql/seafile to use their own ldap user in ou=services

Browse source
This commit is contained in:
Alex 2020-02-11 21:52:57 +01:00
parent ca787155c9
commit acdb34027b
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
consul/configuration/.gitignore vendored
View file

@ -10,6 +10,7 @@
# Whitelist specific files # Whitelist specific files
!seafile/conf/seafdav.conf !seafile/conf/seafdav.conf
!seafile/conf/ccnet.conf
!seafile/ccnet/seafile.ini !seafile/ccnet/seafile.ini
!email/dkim/keytable !email/dkim/keytable

8
consul/configuration/seafile/conf/ccnet.conf.sample → consul/configuration/seafile/conf/ccnet.conf
View file

@ -1,6 +1,6 @@
[General] [General]
USER_NAME = deuxfleurs USER_NAME = deuxfleurs
ID = <to be defined> ID = {{ key "secrets/seafile/ccnet/seafile_id" | trimSpace }}
NAME = deuxfleurs NAME = deuxfleurs
SERVICE_URL = https://cloud.deuxfleurs.fr SERVICE_URL = https://cloud.deuxfleurs.fr
@ -13,9 +13,9 @@ PORT = 13418
[LDAP] [LDAP]
HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/ HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/
BASE = ou=users,dc=deuxfleurs,dc=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 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 LOGIN_ATTR = mail
[Database] [Database]
@ -23,7 +23,7 @@ ENGINE = mysql
HOST = mariadb.service.2.cluster.deuxfleurs.fr HOST = mariadb.service.2.cluster.deuxfleurs.fr
PORT = 3306 PORT = 3306
USER = seafile USER = seafile
PASSWD = <to be defined> PASSWD = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
DB = ccnet-db DB = ccnet-db
CONNECTION_CHARSET = utf8 CONNECTION_CHARSET = utf8

14
nomad/seafile.hcl
View file

@ -111,6 +111,16 @@ job "seafile" {
} }
} }
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf?raw"
destination = "secrets/conf/ccnet.conf.tpl"
mode = "file"
}
template {
source = "secrets/conf/ccnet.conf.tpl"
destination = "secrets/conf/ccnet.conf"
}
template { template {
data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}" data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}"
destination = "secrets/ccnet/mykey.peer" destination = "secrets/ccnet/mykey.peer"
@ -119,10 +129,6 @@ job "seafile" {
data = "{{ key \"configuration/seafile/ccnet/seafile.ini\" }}" data = "{{ key \"configuration/seafile/ccnet/seafile.ini\" }}"
destination = "secrets/ccnet/seafile.ini" destination = "secrets/ccnet/seafile.ini"
} }
template {
data = "{{ key \"configuration/seafile/conf/ccnet.conf\" }}"
destination = "secrets/conf/ccnet.conf"
}
template { template {
data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}" data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}"
destination = "secrets/conf/mykey.peer" destination = "secrets/conf/mykey.peer"