From: Grant Slater <git@firefishy.com>
Date: Sat, 11 Jun 2016 18:59:56 +0000 (+0100)
Subject: imagery: ensure mapserver is restarted when required
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/70e190d5bcb968129f5984b360d28f7bfefc5a3a

imagery: ensure mapserver is restarted when required
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index b9fb548c3..4e51cbee0 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -73,16 +73,18 @@ action :create do
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"
-    exec_start "/usr/bin/spawn-fcgi -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 4 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/spawn-fcgi -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
     type "forking"
     restart "always"
   end
 
   service "mapserv-fcgi-#{layer}" do
+    provider Chef::Provider::Service::Systemd
     action [:enable, :start]
+    supports :status => true, :restart => true, :reload => false
     subscribes :restart, "template[/srv/imagery/mapserver/layer-#{layer}.map]"
-    subscribes :restart, "systemd_service[mapserv-fcgi]"
+    subscribes :restart, "systemd_service[mapserv-fcgi-#{layer}]"
   end
 
   directory "/srv/imagery/nginx/#{site}" do
diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb
index fd30b0763..84a3803d0 100644
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -48,7 +48,7 @@ MAP
     END
     STATUS       DEFAULT
     TYPE         RASTER
-    PROCESSING "RESAMPLE=AVERAGE"
-    PROCESSING "CLOSE_CONNECTION=DEFER"
+    PROCESSING   "RESAMPLE=AVERAGE"
+    PROCESSING   "CLOSE_CONNECTION=DEFER"
   END # layer
 END