fix and update

This commit is contained in:
lendry
2026-06-29 20:05:57 +03:00
parent 115dc4e829
commit 8bbaf8b343
3 changed files with 52 additions and 10 deletions

View File

@@ -10,7 +10,7 @@
set -euo pipefail
SCRIPT_VERSION="2.3.6"
SCRIPT_VERSION="2.3.7"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd "$ROOT_DIR"
@@ -1912,16 +1912,16 @@ render_proxy_rewrite() {
fi
}
# proxy_pass для /idp-api/ — срезает префикс /idp-api/ и проксирует на корень.
# proxy_pass для /idp-api/ — named capture надёжнее rewrite+break с переменной upstream.
render_proxy_idp_api() {
local key="api" up var
up="$(nginx_upstream "$key")"
if [[ "$NGINX_MODE" == "docker" ]]; then
var="$(nginx_upstream_var "$key")"
printf '%s\n set $%s %s;\n rewrite ^/idp-api/(.*)$ /$1 break;\n proxy_pass $%s;' \
printf '%s\n set $%s %s;\n proxy_pass $%s/$api_path$is_args$args;' \
"$NGINX_DOCKER_RESOLVER" "$var" "$up" "$var"
else
printf ' proxy_pass %s/;' "$up"
printf ' proxy_pass %s/$api_path$is_args$args;' "$up"
fi
}
@@ -2095,9 +2095,10 @@ EOF
}
build_nginx_idp_api_proxy_block() {
local proxy_ws proxy_idp proxy_oauth proxy_wk proxy_fedcm
local proxy_ws proxy_idp proxy_auth proxy_oauth proxy_wk proxy_fedcm
proxy_ws="$(render_proxy_rewrite ws /ws)"
proxy_idp="$(render_proxy_idp_api)"
proxy_auth="$(render_proxy_root api)"
proxy_oauth="$(render_proxy_root api)"
proxy_wk="$(render_proxy_root api)"
proxy_fedcm="$(render_proxy_root api)"
@@ -2114,12 +2115,18 @@ ${proxy_ws}
proxy_read_timeout 86400s;
}
location /idp-api/ {
location ~ ^/idp-api/(?<api_path>.*)$ {
${proxy_idp}
proxy_http_version 1.1;
${nginx_proxy_headers}
}
location /auth/ {
${proxy_auth}
proxy_http_version 1.1;
${nginx_proxy_headers}
}
location /oauth/ {
${proxy_oauth}
proxy_http_version 1.1;