fix and update
This commit is contained in:
11
install.sh
11
install.sh
@@ -2336,12 +2336,13 @@ write_nginx_site_api() {
|
||||
local domain="$1"
|
||||
local ssl_type="${2:-none}"
|
||||
local ws_on_api="${3:-true}"
|
||||
local conf ws_block http_preamble ssl_block api_upstream api_location
|
||||
local conf ws_block http_preamble ssl_block api_upstream api_location server_dns
|
||||
conf="$(nginx_conf_target api)"
|
||||
ws_block="$(build_ws_block "$ws_on_api")"
|
||||
http_preamble="$(nginx_http_server_preamble "$domain" "$ssl_type")"
|
||||
api_upstream="$(build_nginx_api_upstream_block)"
|
||||
api_location="$(build_nginx_api_location_block)"
|
||||
server_dns="$(nginx_docker_server_dns_block)"
|
||||
|
||||
if [[ "$ssl_type" == "none" ]]; then
|
||||
nginx_write_conf "$conf" <<EOF
|
||||
@@ -2351,6 +2352,7 @@ server {
|
||||
listen [::]:80;
|
||||
server_name ${domain};
|
||||
client_max_body_size 100m;
|
||||
${server_dns}
|
||||
${ws_block}
|
||||
${api_location}
|
||||
}
|
||||
@@ -2365,6 +2367,7 @@ ${http_preamble}server {
|
||||
server_name ${domain};
|
||||
${ssl_block}
|
||||
client_max_body_size 100m;
|
||||
${server_dns}
|
||||
${ws_block}
|
||||
${api_location}
|
||||
}
|
||||
@@ -2713,6 +2716,9 @@ validate_docker_api_nginx_config() {
|
||||
if grep -q 'proxy_pass.*\$request_uri' "$conf" 2>/dev/null; then
|
||||
fail "Конфиг ${conf} содержит proxy_pass \$request_uri — нужен ./install.sh --fix-all (502 на / без resolver)"
|
||||
fi
|
||||
if grep -q 'proxy_pass \$' "$conf" 2>/dev/null && ! grep -q 'resolver 127\.0\.0\.11' "$conf" 2>/dev/null; then
|
||||
fail "Конфиг ${conf} использует variable proxy_pass без Docker resolver — будет 502 на api.idpmvk.lpr. Выполните ./install.sh --fix-all"
|
||||
fi
|
||||
ok "Конфиг API-домена: proxy_pass → api-gateway:3000"
|
||||
}
|
||||
|
||||
@@ -2743,6 +2749,9 @@ validate_all_docker_nginx_proxy_pass() {
|
||||
if grep -q 'proxy_pass.*\$request_uri' "$conf" 2>/dev/null; then
|
||||
fail "Конфиг $(basename "$conf") содержит proxy_pass \$request_uri — 502 «no resolver defined» на /. Выполните ./install.sh --fix-all"
|
||||
fi
|
||||
if grep -q 'proxy_pass \$' "$conf" 2>/dev/null && ! grep -q 'resolver 127\.0\.0\.11' "$conf" 2>/dev/null; then
|
||||
fail "Конфиг $(basename "$conf") использует variable proxy_pass без resolver 127.0.0.11 — после recreate контейнеров будут 502"
|
||||
fi
|
||||
done
|
||||
shopt -u nullglob
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user