From acdb34027b361cccfe6200ed8f087aa146d0ab55 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 11 Feb 2020 21:52:57 +0100 Subject: WIP: update mysql/seafile to use their own ldap user in ou=services --- nomad/seafile.hcl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'nomad/seafile.hcl') diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl index c930396..1ffd1a1 100644 --- a/nomad/seafile.hcl +++ b/nomad/seafile.hcl @@ -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 { data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}" destination = "secrets/ccnet/mykey.peer" @@ -119,10 +129,6 @@ job "seafile" { data = "{{ key \"configuration/seafile/ccnet/seafile.ini\" }}" destination = "secrets/ccnet/seafile.ini" } - template { - data = "{{ key \"configuration/seafile/conf/ccnet.conf\" }}" - destination = "secrets/conf/ccnet.conf" - } template { data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}" destination = "secrets/conf/mykey.peer" -- cgit v1.2.3 From 6da7ecfa9f001f3a51a1bb183c782821934dec0c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 11 Feb 2020 22:36:45 +0100 Subject: Move ccnet.conf to ccnet.conf.tpl --- nomad/seafile.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nomad/seafile.hcl') diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl index 1ffd1a1..dc076c6 100644 --- a/nomad/seafile.hcl +++ b/nomad/seafile.hcl @@ -112,7 +112,7 @@ job "seafile" { } artifact { - source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf?raw" + source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf.tpl?raw" destination = "secrets/conf/ccnet.conf.tpl" mode = "file" } -- cgit v1.2.3 From afaf89f7512036318bd7a187c91e19601b7470d6 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 15 Feb 2020 16:02:16 +0100 Subject: Add missing templated passwords --- nomad/seafile.hcl | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'nomad/seafile.hcl') diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl index dc076c6..f118999 100644 --- a/nomad/seafile.hcl +++ b/nomad/seafile.hcl @@ -116,11 +116,31 @@ job "seafile" { destination = "secrets/conf/ccnet.conf.tpl" mode = "file" } - template { + 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 { data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}" destination = "secrets/ccnet/mykey.peer" @@ -137,14 +157,6 @@ job "seafile" { data = "{{ key \"configuration/seafile/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 { data = "{{ key \"configuration/seafile/conf/gunicorn.conf\" }}" destination = "secrets/conf/gunicorn.conf" -- cgit v1.2.3