Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 50bfd24b8fd2dcc914f05d73ed3af0145ef3b3ee..e64231a72d86655345526f6a4eacd244d874f91c 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -19,6 +19,8 @@
 
 require "yaml"
 
 
 require "yaml"
 

+unified_mode true
+

 default_action :create
 
 property :site, String, :name_property => true
 default_action :create
 
 property :site, String, :name_property => true


@@ -107,7 +109,8 @@ action :create do
                   "GDAL_CACHEMAX" => "512"
       limit_nofile 16384
       limit_cpu 180
                   "GDAL_CACHEMAX" => "512"
       limit_nofile 16384
       limit_cpu 180

-      memory_max "4G"
+      memory_high "512M"
+      memory_max "1G"

       user "imagery"
       group "imagery"
       exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket"
       user "imagery"
       group "imagery"
       exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket"