imagery: allow longer for mapserver to shutdown

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 23771a4fcfd4409d42b485d731051f51fa540b76..83926229a50a42bb559283c4f1ef844e63491178 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -113,6 +113,7 @@ action :create do
     standard_input "socket"
     sandbox true
     restrict_address_families "AF_UNIX"
+    timeout_stop_sec 60
     not_if { new_resource.uses_tiler }
   end
 
@@ -146,16 +147,19 @@ action :create do
     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"
-    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]
+    not_if { new_resource.uses_tiler }
   end
 
   ssl_certificate new_resource.site do