X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/16c9e170f6e1df8c3618615410367f2fe89c41b1..f62feff0ce0768b74303be8ec0f939277353cd91:/cookbooks/imagery/resources/site.rb?ds=sidebyside diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index d9dad4be8..7137458b3 100644 --- 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 + 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" + timeout_stop_sec 60 not_if { new_resource.uses_tiler } end @@ -151,8 +153,8 @@ action :create do systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do on_boot_sec "10m" - on_unit_inactive_sec "1h" - randomized_delay_sec "30m" + on_unit_inactive_sec "30m" + randomized_delay_sec "20m" not_if { new_resource.uses_tiler } end