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

Add missing templated passwords

Browse source
This commit is contained in:
Alex 2020-02-15 16:02:16 +01:00
parent 6da7ecfa9f
commit afaf89f751
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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': {

30
nomad/seafile.hcl
View file

@ -116,11 +116,31 @@ job "seafile" {
destination = "secrets/conf/ccnet.conf.tpl" destination = "secrets/conf/ccnet.conf.tpl"
mode = "file" mode = "file"
} }
template { template {
source = "secrets/conf/ccnet.conf.tpl" source = "secrets/conf/ccnet.conf.tpl"
destination = "secrets/conf/ccnet.conf" 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"
@ -137,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"