X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f153bcdc25b7df0778aee101d32487cafa6d292f..a06b97a5d39d63f59f930134c1a2f0038ea8191c:/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 721867f34..548d0f3c9 100644
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -2,12 +2,27 @@
 
 location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   # 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";
+  fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
   fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @layer %>.socket";
+  fastcgi_buffers 8 64k;
   include fastcgi_params;
+
+  # Caching
+  fastcgi_cache "fastcgi_cache_zone";
+  fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";
+  fastcgi_keep_conn on;
+  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;
+
   gzip off;
+  expires 7d;
 }
 
 <% 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 -%>