From 757053b7351cda90bec94082adb4117155b6da8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Tue, 28 Feb 2023 23:07:16 +0100 Subject: [PATCH] modify nginx config for federation modules --- .../nginx/sites-available/gradido-federation.conf.template | 1 + deployment/bare_metal/start.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template index 2696a6b7d..2192b7dbb 100644 --- a/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template +++ b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template @@ -1,3 +1,4 @@ + location /api/$FEDERATION_APIVERSION { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index a4b990527..e2d3ce8cf 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -75,6 +75,7 @@ export BUILD_COMMIT="$(git rev-parse HEAD)" # Generate gradido.conf from template # *** 1st prepare for each apiversion the federation conf for nginx from federation-template # *** set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS and create gradido-federation.conf file +rm $NGINX_CONFIG_DIR/gradido-federation.conf echo "================================================================================================" IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" @@ -91,8 +92,7 @@ done echo "================================================================================================" # *** 2nd read gradido-federation.conf file in env variable -FEDERATION_NGINX_CONF < $NGINX_CONFIG_DIR/gradido-federation.conf -export FEDERATION_NGINX_CONF +export FEDERATION_NGINX_CONF < $NGINX_CONFIG_DIR/gradido-federation.conf echo "FEDERATION_NGINX_CONF=$FEDERATION_NGINX_CONF" # *** 3rd generate gradido nginx config including federation modules per api-version