From: Grant Slater <git@firefishy.com>
Date: Fri, 6 Jul 2018 09:52:22 +0000 (+0100)
Subject: Imagery: switch back to using multiwatch
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/f28a1081e98606e992c613cb1e15f55e75c9b546?ds=inline

Imagery: switch back to using multiwatch
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 0fd38f2f8..324d61a92 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -75,7 +75,7 @@ action :create do
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket"
-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -F 4 -- /usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -- /usr/bin/multiwatch -f 4 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     private_tmp true
     private_devices true
     private_network true