From 286f134943376ccf73e8f9593f52861afc5b1b81 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Jun 2024 19:22:25 +0100 Subject: [PATCH 1/1] imagery: do not duplicate Access-Control-Allow-Origin header --- .../default/nginx_imagery_layer_fragment.conf.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 e72a6d7e9..b05826114 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -23,10 +23,12 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { proxy_cache_use_stale error timeout updating http_502 http_503 http_504; proxy_cache_background_update on; proxy_next_upstream error timeout invalid_header http_500 http_503; + proxy_next_upstream_timeout 30s; proxy_next_upstream_tries 3; proxy_intercept_errors on; - proxy_next_upstream_timeout 30s; - + proxy_ignore_headers Cache-Control; + proxy_ignore_headers Expires; + proxy_ignore_headers Access-Control-Allow-Origin; <% else -%> # Override QUERY_STRING to force mapserver query parameters fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1"; @@ -69,7 +71,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { add_header x-cache-status $upstream_cache_status; # Allow CORS requests - add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Origin' '*' always; } <% if @root_layer -%> -- 2.39.5