From e98113240d279331e24a1d3da6b5fcea6c65bd82 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jan 2022 13:39:15 +0100
Subject: [PATCH] fix docker setup by changing the default value for logging
 path make the path configurable for the bare metal deployment and deploy old
 default value as default for bare metal deployment

---
 backend/.env.dist                | 1 +
 backend/.env.template            | 1 +
 backend/src/config/index.ts      | 3 +--
 deployment/bare_metal/.env.dist  | 2 ++
 deployment/bare_metal/install.sh | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/.env.dist b/backend/.env.dist
index 2f7f02a78..785b2c15d 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -8,6 +8,7 @@ DB_PORT=3306
 DB_USER=root
 DB_PASSWORD=
 DB_DATABASE=gradido_community
+TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log
 
 #EMAIL=true
 #EMAIL_USERNAME=
diff --git a/backend/.env.template b/backend/.env.template
index a1cc3eb6b..9ff9beb01 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -8,6 +8,7 @@ DB_PORT=3306
 DB_USER=$DB_USER
 DB_PASSWORD=$DB_PASSWORD
 DB_DATABASE=gradido_community
+TYPEORM_LOGGING_RELATIVE_PATH=$TYPEORM_LOGGING_RELATIVE_PATH
 
 EMAIL=$EMAIL
 EMAIL_USERNAME=$EMAIL_USERNAME
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 5e4b750de..7ca55eba1 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -18,8 +18,7 @@ const database = {
   DB_USER: process.env.DB_USER || 'root',
   DB_PASSWORD: process.env.DB_PASSWORD || '',
   DB_DATABASE: process.env.DB_DATABASE || 'gradido_community',
-  TYPEORM_LOGGING_RELATIVE_PATH:
-    process.env.TYPEORM_LOGGING_RELATIVE_PATH || '../deployment/bare_metal/log/typeorm.backend.log',
+  TYPEORM_LOGGING_RELATIVE_PATH: process.env.TYPEORM_LOGGING_RELATIVE_PATH || 'typeorm.backend.log',
 }
 
 const klicktipp = {
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index fa1b31d38..4e737a95e 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -26,6 +26,8 @@ EMAIL_SMTP_URL=smtp.lustig.de
 EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{code}
 EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset/{code}
 
+TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log
+
 WEBHOOK_ELOPAGE_SECRET=secret
 
 # frontend
diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
index c4616d7c7..b6ea5cd78 100755
--- a/deployment/bare_metal/install.sh
+++ b/deployment/bare_metal/install.sh
@@ -108,6 +108,7 @@ sudo mysql <<EOFMYSQL
 EOFMYSQL
 
 # Configure database
+# TODO - do this in the start.sh to regenerate configs on each deploy
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/database/.env.template > $PROJECT_ROOT/database/.env
 
 # Configure backend