Allow AF_UNIX sockets for cgimap

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 11bb8b6465ab4d2ef89f106a35f8bc0804e24096..b5d50ee349bf992ae1eb93446972ebbd4336b499 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -86,7 +86,7 @@ action :create do
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
-    YAML.safe_load(::File.read(path), [Symbol])
+    YAML.safe_load(::File.read(path), :permitted_classes => [Symbol])
   end
 
   declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do
@@ -107,11 +107,11 @@ action :create do
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
-    memory_high "512M"
-    memory_max "1G"
+    memory_high "1G"
+    memory_max "4G"
     user "imagery"
     group "imagery"
-    exec_start "/usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     private_tmp true
     private_devices true
@@ -119,6 +119,8 @@ action :create do
     protect_system "full"
     protect_home true
     no_new_privileges true
+    # Terminate service after 30mins. Service is socket activated
+    runtime_max_sec 1800
   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do
@@ -126,10 +128,9 @@ action :create do
     socket_user "imagery"
     socket_group "imagery"
     listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
-
   end
 
-  # Ensure service is stopped else socket cannot reload
+  # Ensure service is stopped because otherwise the socket cannot reload
   service "mapserv-fcgi-#{new_resource.site}" do
     provider Chef::Provider::Service::Systemd
     action :nothing
@@ -137,7 +138,7 @@ action :create do
     subscribes :stop, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
   end
 
-  systemd_unit 'mapserv-fcgi-#{new_resource.site}.socket' do
+  systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do
     action [:enable, :start]
     subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
   end