Imagery: add cache busting revision number

[chef.git] / cookbooks / imagery / resources / layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 6c6c2387f8b11d105c8beb74ee5b672dd26758d6..e60ed7619db339566eb8650343ab8c12dfaf830c 100644 (file)
--- 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]
+property :url_aliases, [String, Array], :default => []
+property :revision, Fixnum, :default => 1
 
 action :create do
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
@@ -47,21 +46,23 @@ action :create do
     variables new_resource.to_hash
   end
 
-  template "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
-    cookbook "imagery"
-    source "mapserv_fcgi.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    variables new_resource.to_hash
+  systemd_service "mapserv-fcgi-#{layer}" do
+    description "Map server for #{layer} layer"
+    limit_nofile 16384
+    environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                "MS_ERRORFILE" => "/tmp/mapserver-layer-#{layer}.log",
+                "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"
+    restart "on-failure"
   end
 
-  service "mapserv-fcgi-layer-#{layer}" do
-    provider Chef::Provider::Service::Upstart
+  service "mapserv-fcgi-#{layer}" do
     action [:enable, :start]
-    supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "template[/etc/init/mapserv-fcgi-layer-#{layer}.conf]"
+    subscribes :restart, "systemd_service[mapserv-fcgi]"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
@@ -83,16 +84,14 @@ end
 
 action :delete do
   service "mapserv-fcgi-layer-#{layer}" do
-    provider Chef::Provider::Service::Upstart
     action [:stop, :disable]
-    supports :status => true, :restart => true, :reload => false
   end
 
   file "/srv/imagery/mapserver/layer-#{layer}.map" do
     action :delete
   end
 
-  file "/etc/init/mapserv-fcgi-layer-#{layer}.conf" do
+  systemd_service "mapserv-fcgi-#{layer}" do
     action :delete
   end
 
@@ -100,3 +99,7 @@ action :delete do
     action :delete
   end
 end
+
+def after_created
+  notifies :restart, "service[nginx]"
+end