Merge pull request #3282 from gradido/prerelease-2_2_0

fix(backend): prevent warning, fix env error

backend/.env.template

@@ -54,7 +54,7 @@ EMAIL_LINK_VERIFICATION_PATH=$EMAIL_LINK_VERIFICATION_PATH
 EMAIL_LINK_SETPASSWORD_PATH=$EMAIL_LINK_SETPASSWORD_PATH
 EMAIL_LINK_FORGOTPASSWORD_PATH=$EMAIL_LINK_FORGOTPASSWORD_PATH
 EMAIL_LINK_OVERVIEW_PATH=$EMAIL_LINK_OVERVIEW_PATH
-EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME_PATH
+EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME
 EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
 
 # Webhook

backend/src/server/createServer.ts

@@ -79,6 +79,8 @@ export const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   // bodyparser json
   app.use(json())

deployment/bare_metal/.env.dist

@@ -30,7 +30,6 @@ FRONTEND_CONFIG_VERSION=v5.2024-01-08
 ADMIN_CONFIG_VERSION=v2.2024-01-04
 FEDERATION_CONFIG_VERSION=v2.2023-08-24
 FEDERATION_DHT_CONFIG_VERSION=v4.2024-01-17
-
 FEDERATION_DHT_TOPIC=GRADIDO_HUB
 
 # Need adjustments for test system

deployment/bare_metal/start.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# check for parameter
+if [ -z "$1" ]; then
+    echo "Usage: Please provide a branch name as the first argument."
+    exit 1
+fi
 # Find current directory & configure paths
 set -o allexport
 SCRIPT_PATH=$(realpath $0)
@@ -80,7 +84,7 @@ pm2 delete all
 pm2 save
 
 # git
-BRANCH=${1:-master}
+BRANCH=$1
 echo "Starting with git pull - branch:$BRANCH" >> $UPDATE_HTML
 cd $PROJECT_ROOT
 # TODO: this overfetches alot, but ensures we can use start.sh with tags

deployment/hetzner_cloud/install.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+# check for parameter
+if [ -z "$1" ]; then
+    echo "Usage: Please provide a branch name as the first argument."
+    exit 1
+fi
 
 # Note: This is needed - since there is Summer-Time included in the default server Setup - UTC is REQUIRED for production data
 timedatectl set-timezone UTC

dlt-connector/src/server/createServer.ts

@@ -62,6 +62,8 @@ const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   await apollo.start()
   app.use(

federation/src/server/createServer.ts

@@ -84,6 +84,8 @@ export const createServer = async (
      */
   })
   app.use(limiter)
+  // because of nginx proxy, needed for limiter
+  app.set('trust proxy', 1)
 
   // bodyparser json
   app.use(express.json())