imagery: remove stale mapserver socket on start

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index e60ed7619db339566eb8650343ab8c12dfaf830c..db9c395ed7dd44d0218259f54a30bea145364338 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -50,13 +50,14 @@ action :create do
     description "Map server for #{layer} layer"
     limit_nofile 16384
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
     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"
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"

     user "imagery"
     group "imagery"
     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"
+    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 -- /usr/lib/cgi-bin/mapserv"
+    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
+    type "forking"
+    restart "always"

   end
 
   service "mapserv-fcgi-#{layer}" do
   end
 
   service "mapserv-fcgi-#{layer}" do