From 260ac90f860154f6c8df8e401387f5dff488adb6 Mon Sep 17 00:00:00 2001
From: pedro <git2021@cas.cat>
Date: Wed, 20 Sep 2023 00:11:58 +0200
Subject: [PATCH] reorder env vars in entrypoint for coherence

---
 docker/devicehub.entrypoint.sh | 39 ++++++++++++++++------------------
 examples/env.example           |  2 +-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/docker/devicehub.entrypoint.sh b/docker/devicehub.entrypoint.sh
index a7d25dbb..e8c89a6b 100755
--- a/docker/devicehub.entrypoint.sh
+++ b/docker/devicehub.entrypoint.sh
@@ -9,29 +9,26 @@ set -x
 gen_env_vars() {
         # generate config using env vars from docker
         cat > .env <<END
-DB_USER=${DB_USER}
-DB_PASSWORD=${DB_PASSWORD}
-DB_HOST=${DB_HOST}
-DB_DATABASE=${DB_DATABASE}
-SCHEMA=dbtest
-DB_SCHEMA=dbtest
-HOST=${HOST}
-EMAIL_DEMO=${EMAIL_DEMO}
-PASSWORD_DEMO=${PASSWORD_DEMO}
+DB_USER='${DB_USER}'
+DB_PASSWORD='${DB_PASSWORD}'
+DB_HOST='${DB_HOST}'
+DB_DATABASE='${DB_DATABASE}'
+API_DLT='${API_DLT}'
+API_DLT_TOKEN='${API_DLT_TOKEN}'
+API_RESOLVER='${API_RESOLVER}'
+ID_FEDERATED='${ID_FEDERATED}'
+URL_MANUALS='${URL_MANUALS}'
+
+HOST='${HOST}'
+
+SCHEMA='dbtest'
+DB_SCHEMA='dbtest'
+
+EMAIL_DEMO='${EMAIL_DEMO}'
+PASSWORD_DEMO='${PASSWORD_DEMO}'
+
 JWT_PASS=${JWT_PASS}
 SECRET_KEY=${SECRET_KEY}
-
-API_DLT=${API_DLT}
-API_RESOLVER=${API_RESOLVER}
-API_DLT_TOKEN=${API_DLT_TOKEN}
-ID_FEDERATED=${ID_FEDERATED}
-
-OAUTH2_JWT_ENABLED=True
-OAUTH2_JWT_ISS=https://authlib.org
-OAUTH2_JWT_KEY=secret-key
-OAUTH2_JWT_ALG=HS256
-
-URL_MANUALS=${URL_MANUALS}
 END
 }
 
diff --git a/examples/env.example b/examples/env.example
index 68366898..8b6d62d2 100644
--- a/examples/env.example
+++ b/examples/env.example
@@ -3,7 +3,7 @@ DB_PASSWORD='ereuse'
 DB_HOST='localhost'
 DB_DATABASE='devicehub'
 API_DLT='http://$IP_API_DLT'
-API_DLT_TOKEN=$TOKEN
+API_DLT_TOKEN='$TOKEN'
 API_RESOLVER='http://$IP_API_RESOLVER'
 # TODO this should be guessed by DEVICEHUB_HOST, and avoid hardcode of ID_FEDERATED
 ID_FEDERATED='$ID'