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 300800f0aeb5d4fa0b7ae417d01ed87bf76da25d..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
@@ -108,7 +108,7 @@ action :create do
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
     memory_high "1G"
-    memory_max "2G"
+    memory_max "4G"
     user "imagery"
     group "imagery"
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
@@ -119,8 +119,8 @@ action :create do
     protect_system "full"
     protect_home true
     no_new_privileges true
-    # Terminate service after 5mins. Service is socket activated
-    runtime_max_sec 300
+    # Terminate service after 30mins. Service is socket activated
+    runtime_max_sec 1800
   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do