From 1ac545ae87eb12e1bce6098f29002bd809a6b701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= Date: Sat, 12 Mar 2022 16:04:21 +0100 Subject: [PATCH] backend: support persistent JWT_SECRET --- backend/src/beherbergung/config/state.clj | 6 ++++-- backend/src/config.edn | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/src/beherbergung/config/state.clj b/backend/src/beherbergung/config/state.clj index 0c2dae9..d2b93bb 100644 --- a/backend/src/beherbergung/config/state.clj +++ b/backend/src/beherbergung/config/state.clj @@ -7,8 +7,8 @@ (s/def ::frontend-base-url string?) (s/def ::frontend-backend-base-url string?) - (s/def ::port number?) ;; the webserver port +(s/def ::jwt-secret (s/nilable string?)) (s/def ::verbose boolean?) @@ -34,6 +34,7 @@ (s/def ::env (s/keys :req-un [::frontend-base-url ::frontend-backend-base-url ::port + ::jwt-secret ::verbose ::validate-output ::db-inmemory ::db-dir @@ -47,7 +48,8 @@ (defn strip-secrets [env] (assoc env :mail-pass "*" - :admin-passphrase "*")) + :admin-passphrase "*" + :jwt-secret "*")) (defn filter-defined [keys-spec m] (let [req-un (last (s/form keys-spec)) diff --git a/backend/src/config.edn b/backend/src/config.edn index 54e9c16..4c55c3c 100644 --- a/backend/src/config.edn +++ b/backend/src/config.edn @@ -1,7 +1,13 @@ -{:verbose false +{ + :frontend-base-url "http://localhost:4000" + :frontend-backend-base-url "http://localhost:4000" :port 4000 + :jwt-secret nil + + :verbose false + :validate-output true :db-inmemory false @@ -20,7 +26,4 @@ :admin-passphrase nil :admin-gpg-id "9EA68B7F21204979645182E4287B083353C3241C" - - :frontend-base-url "http://localhost:4000" - :frontend-backend-base-url "http://localhost:4000" }