From: Grant Slater <git@firefishy.com>
Date: Sun, 29 May 2016 22:10:59 +0000 (+0100)
Subject: imagery: fork spawn-fcgi with pid
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6b22d311817728bcc482d5954eef2ada03e84eca?ds=sidebyside

imagery: fork spawn-fcgi with pid
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 685631dc6..fb1186843 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -53,8 +53,10 @@ action :create do
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
     user "imagery"
     group "imagery"
-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -- /usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv"
-    restart "on-failure"
+    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 -- /usr/lib/cgi-bin/mapserv"
+    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
+    type "forking"
+    restart "always"
   end
 
   service "mapserv-fcgi-#{layer}" do