From 9ebd1b2e632dcbdd8bd51c0ef4738b75d2da9605 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 15 Oct 2025 00:24:43 +0100 Subject: [PATCH] imagery: fix backend name conflict --- .../default/nginx_imagery_layer_fragment.conf.erb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb index 50fbc0de2..91bbc09b7 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -8,10 +8,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(jpg|jpeg|png|webp)$" { set $ext $4; # Serve local file if present; otherwise jump to proxy - try_files /layer/<%= @layer %>/$z/$x/$y.jpg /layer/<%= @layer %>/$z/$x/$y.jpeg /layer/<%= @layer %>/$z/$x/$y.png /layer/<%= @layer %>/$z/$x/$y.webp @tile_backend; - - # Return transparent PNG for HTTP 204 (no content) responses from backend - # error_page 204 =200 /transparent.png; + try_files /layer/<%= @layer %>/$z/$x/$y.jpg /layer/<%= @layer %>/$z/$x/$y.jpeg /layer/<%= @layer %>/$z/$x/$y.png /layer/<%= @layer %>/$z/$x/$y.webp @<%= @site %>_<%= @layer %>_backend; gzip off; expires 31d; @@ -20,7 +17,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(jpg|jpeg|png|webp)$" { add_header 'Access-Control-Allow-Origin' '*' always; } -location @tile_backend { +location @<%= @site %>_<%= @layer %>_backend { internal; <% if @uses_tiler -%> -- 2.39.5