X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/58616268564ac6eb6ff6ecaa232c6f7f9dce819d..571e5982cc82c4fbefff0d463895a029a68921fe:/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb?ds=inline 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..c85dd87bb 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -6,7 +6,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { rewrite ^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.jpg /mosaicjson/tiles/WebMercatorQuad/$1/$2/$3@1x?url=<%= URI.encode_www_form_component(@source) %>&pixel_selection=first&tile_format=jpeg break; rewrite ^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.jpeg /mosaicjson/tiles/WebMercatorQuad/$1/$2/$3@1x?url=<%= URI.encode_www_form_component(@source) %>&pixel_selection=first&tile_format=jpeg break; rewrite ^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.png /mosaicjson/tiles/WebMercatorQuad/$1/$2/$3@1x?url=<%= URI.encode_www_form_component(@source) %>&pixel_selection=first&tile_format=png break; - proxy_pass http://tiler_backend; + proxy_pass http://<%= @site %>_tiler_backend; proxy_set_header Host $host; proxy_set_header Referer $http_referer; proxy_set_header X-Forwarded-For $remote_addr; @@ -23,10 +23,14 @@ 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_hide_header "Cache-Control"; + proxy_hide_header "Expires"; + proxy_hide_header "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 +73,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 -%>