Browse Source

Merge pull request #1519 from jc21/fixes-incorrect-proxy-path

Updates proxy paths
jc21 4 years ago
parent
commit
6b7a8b009e

+ 1 - 1
backend/templates/_location.conf

@@ -1,5 +1,5 @@
   location {{ path }} {
   location {{ path }} {
-    set              $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
+    set              $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }}$request_uri;
     proxy_set_header Host $host;
     proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Scheme $scheme;
     proxy_set_header X-Forwarded-Scheme $scheme;
     proxy_set_header X-Forwarded-Proto  $scheme;
     proxy_set_header X-Forwarded-Proto  $scheme;

+ 2 - 1
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;
 add_header       X-Served-By $host;
 proxy_set_header Host $host;
 proxy_set_header Host $host;
 proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $remote_addr;
 proxy_set_header X-Forwarded-For    $remote_addr;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_set_header X-Real-IP          $remote_addr;
-proxy_pass       $forward_scheme://$server:$port;
+proxy_pass       $upstream;