From 87731a8b5c7ee698c71bbe92aea50494b127daf7 Mon Sep 17 00:00:00 2001 From: Julian Reinhardt Date: Mon, 25 Oct 2021 14:27:37 +0200 Subject: [PATCH 1/4] Revert "Utilise variable for custom locations proxy_pass" This reverts commit 6c1ae77a2a40283c5444c2f7e0a7c8227aeecbd2. --- backend/templates/_location.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/templates/_location.conf b/backend/templates/_location.conf index 7d70700..5a7a6ab 100644 --- a/backend/templates/_location.conf +++ b/backend/templates/_location.conf @@ -1,11 +1,10 @@ location {{ path }} { - set $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}; 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 {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}; {% if access_list_id > 0 %} {% if access_list.items.length > 0 %} From bbde7a108aa1ef7353a8c314fdddd5e127fc81a4 Mon Sep 17 00:00:00 2001 From: Julian Reinhardt Date: Mon, 25 Oct 2021 14:48:22 +0200 Subject: [PATCH 2/4] Use variable with full uri in proxy pass --- backend/templates/_location.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/templates/_location.conf b/backend/templates/_location.conf index 5a7a6ab..2b85793 100644 --- a/backend/templates/_location.conf +++ b/backend/templates/_location.conf @@ -1,10 +1,11 @@ location {{ path }} { + set $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}$request_uri; 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 {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}; + proxy_pass $upstream; {% if access_list_id > 0 %} {% if access_list.items.length > 0 %} From ca59e585d81d953b79c117eeb3c61743ad4ac85d Mon Sep 17 00:00:00 2001 From: Julian Reinhardt Date: Mon, 25 Oct 2021 14:58:02 +0200 Subject: [PATCH 3/4] Uses variable in proxy_pass for normal proxy hosts --- docker/rootfs/etc/nginx/conf.d/include/proxy.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf index c0dce06..1fda72b 100644 --- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf +++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf @@ -1,8 +1,9 @@ +set $upstream $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 $forward_scheme://$server:$port; +proxy_pass $upstream; From d0bfa082e04cb803aab27b9bf365b070be977900 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 27 Oct 2021 21:43:07 +1000 Subject: [PATCH 4/4] Bump version --- .version | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 0890409..dd9ac7f 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.10 +2.9.11 diff --git a/README.md b/README.md index eec9a7b..a86d518 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- +