X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/24641ab27b9cb1a72a8207a58142b500b0279f58..864d5dd378e3abaceec0119861696aa99f5d5628:/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb 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 856ec6765..372bf0e56 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -4,6 +4,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1"; fastcgi_pass "<%= @site %>_fastcgi"; fastcgi_buffers 8 64k; + fastcgi_busy_buffers_size 64k; include fastcgi_params; fastcgi_param REQUEST_METHOD "GET"; fastcgi_param HTTP_PROXY ""; @@ -16,10 +17,16 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { # Free connection to socket for other requests fastcgi_keep_conn off; - fastcgi_cache_lock on; - fastcgi_cache_lock_timeout 30s; fastcgi_cache_valid 200 21d; + + # Serve stale cache on errors or if updating fastcgi_cache_use_stale error timeout updating http_500 http_503; + # If in cache as stale, serve stale and update in background + fastcgi_cache_background_update on; + # Enable revalidation using If-Modified-Since and If-None-Match for stale items + fastcgi_cache_revalidate on; + + keepalive_requests 0; # Ignore client abort as it causes issues with the pipeline fastcgi_ignore_client_abort on; @@ -34,6 +41,8 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { # Add HTTP Cache-Control + Expires Headers expires 7d; + add_header Cache-Control "stale-while-revalidate=604800, stale-if-error=604800"; + add_header x-cache-status $upstream_cache_status; # Allow CORS requests add_header 'Access-Control-Allow-Origin' '*';