imagery: Add demo Namibian aerial

[chef.git] / 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 e527f125053c084b6f0bf49c41e00a12b9f5585d..856ec6765f07a4fd89a1e3f5a5b293673b3d0e45 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -1,28 +1,34 @@
 # DO NOT EDIT - This file is being maintained by Chef
 # DO NOT EDIT - This file is being maintained by Chef

-

 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";
 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_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @layer %>.socket";
+  fastcgi_pass "<%= @site %>_fastcgi";

   fastcgi_buffers 8 64k;
   include fastcgi_params;
   fastcgi_param REQUEST_METHOD "GET";
   fastcgi_param HTTP_PROXY "";
   fastcgi_buffers 8 64k;
   include fastcgi_params;
   fastcgi_param REQUEST_METHOD "GET";
   fastcgi_param HTTP_PROXY "";

-  fastcgi_read_timeout 300s;
+  fastcgi_read_timeout 60s;

 
   # Caching
   fastcgi_cache "fastcgi_cache_zone";
   fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";
 
   # Caching
   fastcgi_cache "fastcgi_cache_zone";
   fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";

-  fastcgi_keep_conn on;
+
+  # Free connection to socket for other requests
+  fastcgi_keep_conn off;
+

   fastcgi_cache_lock on;
   fastcgi_cache_lock on;

-  fastcgi_cache_lock_timeout 60s;
+  fastcgi_cache_lock_timeout 30s;

   fastcgi_cache_valid 200 21d;
   fastcgi_cache_use_stale error timeout updating http_500 http_503;
 
   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_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 8;
+

   # Do not GZIP tiles
   gzip off;
 
   # Do not GZIP tiles
   gzip off;