From dfaf3c2dbe6fdccc8f6023db16878a610a3f34bb Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:22:18 +0000 Subject: [PATCH] fix order of precedence --- .../nginx/templates/nginx.conf.template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/utils/docker-compose-ingress/nginx/templates/nginx.conf.template b/utils/docker-compose-ingress/nginx/templates/nginx.conf.template index e7093d8b7..c17b3f4c5 100644 --- a/utils/docker-compose-ingress/nginx/templates/nginx.conf.template +++ b/utils/docker-compose-ingress/nginx/templates/nginx.conf.template @@ -113,6 +113,12 @@ http { proxy_set_header Connection "upgrade"; } + + location ~* ^/((metrics)|(api/health)|(api/heap)) { + resolver 127.0.0.11 valid=30s; + return 301 /; + } + location ~* ^/(graphql|explorer|(auth/.*)|(objects/.*)|(preview/.*)|(api/.*)|(static/.*)) { resolver 127.0.0.11 valid=30s; set $upstream_speckle_server speckle-server; @@ -128,11 +134,6 @@ http { proxy_set_header Connection "upgrade"; } - location ~* ^/((metrics)|(api/health)|(api/heap)) { - resolver 127.0.0.11 valid=30s; - return 301 / - } - error_page 500 502 503 504 /50x.html; location = /50x.html {