From 63db34a4620ed542d5cf9f59470efee0a9f13b35 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:47:10 -0500 Subject: [PATCH] default `swag_address` and `swag_url` to container name if `swag_proxy_conf` is set --- root/app/auto-proxy.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/root/app/auto-proxy.sh b/root/app/auto-proxy.sh index afc5155..79f23a6 100755 --- a/root/app/auto-proxy.sh +++ b/root/app/auto-proxy.sh @@ -62,6 +62,9 @@ for CONTAINER in ${AUTO_GEN}; do if [ -n "${swag_address}" ]; then sed -i "s|set \$upstream_app .*|set \$upstream_app ${swag_address};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf" echo "**** Overriding address as ${swag_address} for ${CONTAINER} ****" + elif [ -n "${swag_preset_conf}" ] && [ -f "/config/nginx/proxy-confs/${swag_preset_conf}.subdomain.conf.sample" ]; then + sed -i "s|set \$upstream_app .*|set \$upstream_app ${CONTAINER};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf" + echo "**** Overriding address as ${CONTAINER} for ${CONTAINER} ****" fi if [ -n "${swag_port}" ]; then sed -i "s|set \$upstream_port .*|set \$upstream_port ${swag_port};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf" @@ -75,6 +78,9 @@ for CONTAINER in ${AUTO_GEN}; do SED_swag_url=$(sed -e 's/[&\\|]/\\&/g; s|$|\\|; $s|\\$||' <<<"${swag_url}") sed -i "s|server_name .*|server_name ${SED_swag_url};|" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf" echo "**** Overriding url as ${swag_url} for ${CONTAINER} ****" + elif [ -n "${swag_preset_conf}" ] && [ -f "/config/nginx/proxy-confs/${swag_preset_conf}.subdomain.conf.sample" ]; then + sed -i "s|server_name .*|server_name ${CONTAINER}.*;|" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf" + echo "**** Overriding url as ${CONTAINER}.* for ${CONTAINER} ****" fi if [ -n "${swag_server_custom_directive}" ]; then SED_swag_server_custom_directive=$(sed -e 's/[&\\|]/\\&/g; s|$|\\|; $s|\\$||' <<<"${swag_server_custom_directive}")