replace logic simply now with envsubst

This commit is contained in:
Claus-Peter Hübner 2023-03-02 00:22:35 +01:00
parent af5cf0f585
commit 1a2bfb487e

View File

@ -88,7 +88,7 @@ do
FEDERATION_PORT=$(($FEDERATION_PORT + $port)) FEDERATION_PORT=$(($FEDERATION_PORT + $port))
export FEDERATION_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/\$FEDERATION_APIVERSION\|\$FEDERATION_PORT//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf
done done
echo "====================================================================================================" echo "===================================================================================================="
@ -101,8 +101,9 @@ case "$NGINX_SSL" in
true) TEMPLATE_FILE="gradido.conf.ssl.template" ;; true) TEMPLATE_FILE="gradido.conf.ssl.template" ;;
*) TEMPLATE_FILE="gradido.conf.template" ;; *) TEMPLATE_FILE="gradido.conf.template" ;;
esac esac
envsubst "$(env | sed -e 's/\$FEDERATION_NGINX_CONF//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf.tmp envsubst "$FEDERATION_NGINX_CONF" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf.tmp
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido.conf.tmp > $NGINX_CONFIG_DIR/gradido.conf envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido.conf.tmp > $NGINX_CONFIG_DIR/gradido.conf
# rm $NGINX_CONFIG_DIR/gradido.conf.tmp
# rm $NGINX_CONFIG_DIR/gradido-federation.conf # rm $NGINX_CONFIG_DIR/gradido-federation.conf
# Generate update-page.conf from template # Generate update-page.conf from template