X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8e42e06551a84d361ce637fd89b597bf1442ed60..6f7f7b63e84057aab081c3ab41b14599f4e67522:/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 9c3fbd538..5b42fe937 100644
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -1,9 +1,47 @@
 # DO NOT EDIT - This file is being maintained by Chef
-
-location ~* "^/layer/<%= @name %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
+location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   # Override QUERY_STRING to force mapserver query parameters
-  fastcgi_param  QUERY_STRING "map=/srv/imagery/<%= @name %>.map&mode=tile&layers=<%= @name %>&tilemode=gmap&tile=$2+$3+$1";
-  fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket";
+  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;
   include fastcgi_params;
+  fastcgi_param REQUEST_METHOD "GET";
+  fastcgi_param HTTP_PROXY "";
+  fastcgi_read_timeout 60s;
+
+  # Caching
+  fastcgi_cache "fastcgi_cache_zone";
+  fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";
+
+  # 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;
+  fastcgi_cache_use_stale error timeout updating http_500 http_503;
+
+  # Ignore client abort as it causes issues with the pipeline
+  fastcgi_ignore_client_abort on;
+
+  fastcgi_catch_stderr "Image handling error";
+
+  fastcgi_next_upstream error timeout invalid_header http_500 http_503;
+  fastcgi_next_upstream_tries 3;
+
+  # Do not GZIP tiles
   gzip off;
+
+  # Add HTTP Cache-Control + Expires Headers
+  expires 7d;
+
+  # Allow CORS requests
+  add_header 'Access-Control-Allow-Origin' '*';
 }
+
+<% if @root_layer -%>
+rewrite "^/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" "/layer/<%= @layer %>/$1/$2/$3.$4" last;
+<% end -%>
+<% @url_aliases.each do |url| -%>
+rewrite "^<%= url %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" "/layer/<%= @layer %>/$1/$2/$3.$4" last;
+<% end -%>