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

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 23771a4fcfd4409d42b485d731051f51fa540b76..adbd8e857e728776b1a04d3a068d9538338d2e8f 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -107,12 +107,14 @@ action :create do
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

+    memory_max "8G"

     user "imagery"
     group "imagery"
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     sandbox true
     restrict_address_families "AF_UNIX"
     user "imagery"
     group "imagery"
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     sandbox true
     restrict_address_families "AF_UNIX"

+    timeout_stop_sec 60

     not_if { new_resource.uses_tiler }
   end
 
     not_if { new_resource.uses_tiler }
   end
 


@@ -146,16 +148,19 @@ action :create do
     exec_start "/bin/systemctl --quiet stop mapserv-fcgi-#{new_resource.site}.service"
     sandbox true
     restrict_address_families "AF_UNIX"
     exec_start "/bin/systemctl --quiet stop mapserv-fcgi-#{new_resource.site}.service"
     sandbox true
     restrict_address_families "AF_UNIX"

+    not_if { new_resource.uses_tiler }

   end
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"
     on_unit_inactive_sec "1h"
   end
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"
     on_unit_inactive_sec "1h"

-    randomized_delay_sec "10m"
+    randomized_delay_sec "30m"
+    not_if { new_resource.uses_tiler }

   end
 
   service "mapserv-fcgi-#{new_resource.site}-stop.timer" do
     action [:enable, :start]
   end
 
   service "mapserv-fcgi-#{new_resource.site}-stop.timer" do
     action [:enable, :start]

+    not_if { new_resource.uses_tiler }

   end
 
   ssl_certificate new_resource.site do
   end
 
   ssl_certificate new_resource.site do