IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify nginx config for federation modules

Browse Source
This commit is contained in:
Claus-Peter Hübner 2023-02-28 23:27:21 +01:00
parent fc08dcd896
commit b7ac341a0d
2 changed files with 6 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
View File

@ -113,50 +113,7 @@ server {
}
# Federation
location /api/1_0 {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:5010;
proxy_redirect off;
access_log $GRADIDO_LOG_PATH/nginx-access.federation-5010.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.federation-5010.log warn;
}
location /api/1_1 {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:5011;
proxy_redirect off;
access_log $GRADIDO_LOG_PATH/nginx-access.federation-5011.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.federation-5011.log warn;
}
location /api/2_0 {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:5020;
proxy_redirect off;
access_log $GRADIDO_LOG_PATH/nginx-access.federation-5020.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.federation-5020.log warn;
}
$FEDERATION_NGINX_CONF
# TODO this could be a performance optimization
#location /vue {

14
deployment/bare_metal/start.sh
View File

@ -76,7 +76,7 @@ export BUILD_COMMIT="$(git rev-parse HEAD)"
# *** 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 "================================================================================================"
echo "===================================================================================================="
IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS
for api in "${API_ARRAY[@]}"
do
@ -86,14 +86,13 @@ do
FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000}
FEDERATION_PORT=$(($FEDERATION_PORT + $port))
export FEDERATION_PORT
echo " create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT"
echo " create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT"
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf
done
echo "================================================================================================"
echo "===================================================================================================="
# *** 2nd read gradido-federation.conf file in env variable
# *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step
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
echo 'Generate new gradido nginx config' >> $UPDATE_HTML
@ -102,10 +101,7 @@ case "$NGINX_SSL" in
*) TEMPLATE_FILE="gradido.conf.template" ;;
esac
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf
# release lock
rm $LOCK_FILE
exit 1
rm $NGINX_CONFIG_DIR/gradido-federation.conf
# Generate update-page.conf from template
echo 'Generate new update-page nginx config' >> $UPDATE_HTML