From e628dc44bac9492173c4800c8b999a82b6c55b71 Mon Sep 17 00:00:00 2001 From: Quentin Date: Tue, 22 Dec 2020 14:31:42 +0100 Subject: [PATCH] Migrate seafile --- app/deployment/seafile.hcl | 57 ++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/app/deployment/seafile.hcl b/app/deployment/seafile.hcl index 75d752a..8e2480a 100644 --- a/app/deployment/seafile.hcl +++ b/app/deployment/seafile.hcl @@ -10,6 +10,14 @@ job "seafile" { group "main" { count = 1 + + network { + port "seafile-frontend" { static = 8000 } + port "seafile-seafhttp" { static = 8083 } + port "seafile-dav" { static = 8084 } + port "seafile-hack" { static = 8085 } + } + task "hack" { driver = "docker" config { @@ -125,56 +133,45 @@ 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" + template { + data = file("../config/configuration/seafile/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" + data = file("../config/configuration/seafile/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" + data = file("../config/configuration/seafile/conf/seahub_settings.py.tpl") destination = "secrets/conf/seahub_settings.py" } template { - data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}" - destination = "secrets/ccnet/mykey.peer" - } - template { - data = "{{ key \"configuration/seafile/ccnet/seafile.ini\" }}" + data = file("../config/configuration/seafile/ccnet/seafile.ini") destination = "secrets/ccnet/seafile.ini" } template { - data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}" - destination = "secrets/conf/mykey.peer" - } - template { - data = "{{ key \"configuration/seafile/conf/seafdav.conf\" }}" + data = file("../config/configuration/seafile/conf/seafdav.conf") destination = "secrets/conf/seafdav.conf" } template { - data = "{{ key \"configuration/seafile/conf/gunicorn.conf\" }}" + data = file("../config/configuration/seafile/conf/gunicorn.conf") destination = "secrets/conf/gunicorn.conf" } + + # ---- secrets ---- + # @FIXME should be put in the secret hierarchy in consul + template { + data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}" + destination = "secrets/ccnet/mykey.peer" + } + + template { + data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}" + destination = "secrets/conf/mykey.peer" + } } } }