Merge branch 'master' into fix-navigation-after-email-confirmation

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=

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

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 = {

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

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