From 0bd9fed2517e2679c2460928a9fec3cfb8152089 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jan 2022 18:50:11 +0100
Subject: [PATCH] different .env include in scripts

---
 deployment/bare_metal/backup.sh  | 12 ++++++------
 deployment/bare_metal/install.sh |  8 ++++----
 deployment/bare_metal/restore.sh | 12 ++++++------
 deployment/bare_metal/start.sh   |  9 ++++-----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/deployment/bare_metal/backup.sh b/deployment/bare_metal/backup.sh
index e2473a30d..f562b033a 100755
--- a/deployment/bare_metal/backup.sh
+++ b/deployment/bare_metal/backup.sh
@@ -10,19 +10,19 @@ PROJECT_ROOT=$SCRIPT_DIR/../..
 set +o allexport
 
 # Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
-set -o allexport
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
 if [ -f "$PROJECT_ROOT/backend/.env" ]; then
-    source $PROJECT_ROOT/backend/.env
+    export $(cat $PROJECT_ROOT/backend/.env | sed 's/#.*//g' | xargs)
 else
-    source $PROJECT_ROOT/backend/.env.dist
+    export $(cat $PROJECT_ROOT/backend/.env.dist | sed 's/#.*//g' | xargs)
 fi
-set +o allexport
 
 # Stop Services
-pm2 stop all
+pm2 stop gradido-backend
 
 # Backup data
 mysqldump --databases --single-transaction --quick --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
 
 # Start Services
-pm2 start all
\ No newline at end of file
+pm2 start gradido-backend
\ No newline at end of file
diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
index a92128a93..b8bd11d4e 100755
--- a/deployment/bare_metal/install.sh
+++ b/deployment/bare_metal/install.sh
@@ -11,13 +11,13 @@ PROJECT_ROOT=$SCRIPT_DIR/../..
 set +o allexport
 
 # Load .env or .env.dist if not present
-set -o allexport
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
 if [ -f "$SCRIPT_DIR/.env" ]; then
-    source $SCRIPT_DIR/.env
+    export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
 else
-    source $SCRIPT_DIR/.env.dist
+    export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
 fi
-set +o allexport
 
 # Configure git
 git config pull.ff only
diff --git a/deployment/bare_metal/restore.sh b/deployment/bare_metal/restore.sh
index fa11de28a..62041d9d7 100755
--- a/deployment/bare_metal/restore.sh
+++ b/deployment/bare_metal/restore.sh
@@ -10,16 +10,16 @@ PROJECT_ROOT=$SCRIPT_DIR/../..
 set +o allexport
 
 # Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
-set -o allexport
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
 if [ -f "$PROJECT_ROOT/backend/.env" ]; then
-    source $PROJECT_ROOT/backend/.env
+    export $(cat $PROJECT_ROOT/backend/.env | sed 's/#.*//g' | xargs)
 else
-    source $PROJECT_ROOT/backend/.env.dist
+    export $(cat $PROJECT_ROOT/backend/.env.dist | sed 's/#.*//g' | xargs)
 fi
-set +o allexport
 
 # Stop Services
-pm2 stop all
+pm2 stop gradido-backend
 
 # Backup data
 mysqldump --databases --single-transaction --quick --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-restore-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
@@ -33,4 +33,4 @@ EOFMYSQL
 yarn --cwd $PROJECT_ROOT/database up
 
 # Start Services
-pm2 start all
\ No newline at end of file
+pm2 start gradido-backend
\ No newline at end of file
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 2be5eaee4..5f182f453 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -11,14 +11,13 @@ NGINX_CONFIG_DIR=$SCRIPT_DIR/nginx/sites-available
 set +o allexport
 
 # Load .env or .env.dist if not present
-set -o allexport
-#TODO
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
 if [ -f "$SCRIPT_DIR/.env" ]; then
-    source $SCRIPT_DIR/.env
+    export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
 else
-    source $SCRIPT_DIR/.env.dist
+    export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
 fi
-set +o allexport
 
 # lock start
 if [ -f $LOCK_FILE ] ; then