Merge remote-tracking branch 'github/pull/678'

[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 d861fb8ae443f511923879e9cdac663cd1072c26..c85dd87bb53653eb07b2d18e9aaadc5984f9969a 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,36 +1,79 @@
+<% require 'uri' %>

 # 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)$" {
 location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {

+<% if @uses_tiler -%>
+  set $args "";
+  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://<%= @site %>_tiler_backend;
+  proxy_set_header Host $host;
+  proxy_set_header Referer $http_referer;
+  proxy_set_header X-Forwarded-For $remote_addr;
+  proxy_set_header X-Forwarded-Proto https;
+  proxy_set_header X-Forwarded-SSL on;
+  proxy_http_version 1.1;
+  proxy_set_header Connection "";
+  proxy_set_header Cache-Control "";
+  proxy_set_header Pragma "";
+  proxy_redirect off;
+  proxy_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";
+  proxy_cache proxy_cache_zone;
+  proxy_cache_valid 200 204 180d;
+  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_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";
   # 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_buffers 8 64k;
+  fastcgi_pass "<%= @site %>_fastcgi";

   include fastcgi_params;
   fastcgi_param REQUEST_METHOD "GET";
   fastcgi_param HTTP_PROXY "";
   include fastcgi_params;
   fastcgi_param REQUEST_METHOD "GET";
   fastcgi_param HTTP_PROXY "";

-  fastcgi_read_timeout 180s;
+  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;
-  fastcgi_cache_lock on;
-  fastcgi_cache_lock_timeout 30s;
+
+  # Free connection to socket for other requests
+  fastcgi_keep_conn off;
+

   fastcgi_cache_valid 200 21d;
   fastcgi_cache_valid 200 21d;

+
+  # Serve stale cache on errors or if updating

   fastcgi_cache_use_stale error timeout updating http_500 http_503;
   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;

 
 

-  fastcgi_ignore_client_abort on;
+  keepalive_requests 0;

 
   fastcgi_catch_stderr "Image handling error";
 
 
   fastcgi_catch_stderr "Image handling error";
 

+  fastcgi_next_upstream error timeout invalid_header http_500 http_503;
+  fastcgi_next_upstream_tries 8;
+<% end -%>
+

   # Do not GZIP tiles
   gzip off;
 
   # Add HTTP Cache-Control + Expires Headers
   expires 7d;
   # Do not GZIP tiles
   gzip off;
 
   # 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
 
   # Allow CORS requests

-  add_header 'Access-Control-Allow-Origin' '*';
+  add_header 'Access-Control-Allow-Origin' '*' always;

 }
 
 <% if @root_layer -%>
 }
 
 <% if @root_layer -%>