Renames the $upstream variables and does not append $request_ui if capture group exists in location

This commit is contained in:
Julian Reinhardt 2021-11-04 10:08:15 +01:00
parent d95cd36b3e
commit 3d80759a21
2 changed files with 4 additions and 4 deletions

View File

@ -1,11 +1,11 @@
location {{ path }} {
set $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}$request_uri;
set $targetUri {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}{% unless path contains "(" %}$request_uri{% endunless %};
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Scheme $scheme;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_pass $upstream;
proxy_pass $targetUri;
{% if access_list_id > 0 %}
{% if access_list.items.length > 0 %}

View File

@ -1,9 +1,9 @@
set $upstream $forward_scheme://$server:$port$request_uri;
set $targetUri $forward_scheme://$server:$port$request_uri;
add_header X-Served-By $host;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Scheme $scheme;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_pass $upstream;
proxy_pass $targetUri;