Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Template seafile configuration users and passwords #8

Manually merged
lx merged 3 commits from wip_seafile into master 2020-02-15 15:23:01 +00:00
Conversation 0 Commits 3 Files changed 4 +36 -18
4 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
consul/configuration/seafile/conf/ccnet.conf.sample → consul/configuration/seafile/conf/ccnet.conf.tpl
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

2
consul/configuration/seafile/conf/seafile.conf.sample → consul/configuration/seafile/conf/seafile.conf.tpl
View file

@ -11,7 +11,7 @@ type = mysql
host = mariadb.service.2.cluster.deuxfleurs.fr host = mariadb.service.2.cluster.deuxfleurs.fr
port = 3306 port = 3306
user = seafile user = seafile
password = <to be defined> password = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
db_name = seafile-db db_name = seafile-db
connection_charset = utf8 connection_charset = utf8

2
consul/configuration/seafile/conf/seahub_settings.py.sample → consul/configuration/seafile/conf/seahub_settings.py.tpl
View file

@ -5,7 +5,7 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': 'seahub-db', 'NAME': 'seahub-db',
'USER': 'seafile', 'USER': 'seafile',
'PASSWORD': '<to be defined>', 'PASSWORD': '{{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}',
'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr', 'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr',
'PORT': '3306', 'PORT': '3306',
'OPTIONS': { 'OPTIONS': {

42
nomad/seafile.hcl
View file

@ -111,6 +111,36 @@ job "seafile" {
} }
} }
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf.tpl?raw"
destination = "secrets/conf/ccnet.conf.tpl"
mode = "file"
}
template {
source = "secrets/conf/ccnet.conf.tpl"
destination = "secrets/conf/ccnet.conf"
}
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/seafile.conf.tpl?raw"
destination = "secrets/conf/seafile.conf.tpl"
mode = "file"
}
template {
source = "secrets/conf/seafile.conf.tpl"
destination = "secrets/conf/seafile.conf"
}
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/seahub_settings.py.tpl?raw"
destination = "secrets/conf/seahub_settings.py.tpl"
mode = "file"
}
template {
source = "secrets/conf/seahub_settings.py.tpl"
destination = "secrets/conf/seahub_settings.py"
}
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 +149,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"
@ -131,14 +157,6 @@ job "seafile" {
data = "{{ key \"configuration/seafile/conf/seafdav.conf\" }}" data = "{{ key \"configuration/seafile/conf/seafdav.conf\" }}"
destination = "secrets/conf/seafdav.conf" destination = "secrets/conf/seafdav.conf"
} }
template {
data = "{{ key \"configuration/seafile/conf/seafile.conf\" }}"
destination = "secrets/conf/seafile.conf"
}
template {
data = "{{ key \"configuration/seafile/conf/seahub_settings.py\" }}"
destination = "secrets/conf/seahub_settings.py"
}
template { template {
data = "{{ key \"configuration/seafile/conf/gunicorn.conf\" }}" data = "{{ key \"configuration/seafile/conf/gunicorn.conf\" }}"
destination = "secrets/conf/gunicorn.conf" destination = "secrets/conf/gunicorn.conf"