From: Grant Slater <git@firefishy.com>
Date: Sun, 29 May 2016 18:27:46 +0000 (+0100)
Subject: Imagery: add cache busting revision number
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5216dd84be820f69e4c1503986a94664a2ee0ba6?ds=sidebyside

Imagery: add cache busting revision number
---

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index d17e726d5..85816c3f4 100644
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -31,4 +31,5 @@ imagery_layer "au_ga_agri" do
   background_colour "0 0 0" # Black
   projection "EPSG:3857"
   source "/data/imagery/au/agri/combine.vrt"
+  revision 1
 end
diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 22509eb57..e60ed7619 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -31,11 +31,10 @@ property :extent, String
 property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
-property :extension, String,
-         :is => %w(png png8 jpeg),
-         :default => "png"
+property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
+property :revision, Fixnum, :default => 1
 
 action :create do
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
@@ -53,7 +52,7 @@ action :create do
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
                 "MS_ERRORFILE" => "/tmp/mapserver-layer-#{layer}.log",
-                "MS_DEBUGLEVEL" => "5"
+                "MS_DEBUGLEVEL" => "1"
     user "imagery"
     group "imagery"
     exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -f /usr/lib/cgi-bin/mapserv"
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 d5e4a420f..50b3070c9 100644
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -9,7 +9,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
 
   # Caching
   fastcgi_cache "fastcgi_cache_zone";
-  fastcgi_cache_key "<%= @layer %> $request_method $1 $2 $3";
+  fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3";
   fastcgi_cache_lock on;
   fastcgi_cache_lock_timeout 30s;
   fastcgi_cache_valid 200 21d;