imagery: Disable WMS cache for now. Permissions do now allow

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index a5f86e1b33a8379b4a909075be51333de0ab3aad..6a20594c79d2204a017b419c505a4f6017f46e00 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -105,15 +105,18 @@ action :create do
     description "Map server for #{new_resource.site} layer"
     environment "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr",
     description "Map server for #{new_resource.site} layer"
     environment "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr",

-                "GDAL_CACHEMAX" => "512"
+                "GDAL_CACHEMAX" => "128",
+                "GDAL_HTTP_TCP_KEEPALIVE" => "YES",
+                "GDAL_HTTP_VERSION" => "2TLS",
+                "GDAL_ENABLE_WMS_CACHE" => "NO"

     limit_nofile 16384
     limit_nofile 16384

-    memory_high "2G"
-    memory_max "8G"
+    memory_high "12G"
+    memory_max "12G"

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

-    sandbox true
+    sandbox :enable_network => true

     restrict_address_families "AF_UNIX"
     timeout_stop_sec 60
     not_if { new_resource.uses_tiler }
     restrict_address_families "AF_UNIX"
     timeout_stop_sec 60
     not_if { new_resource.uses_tiler }


@@ -154,7 +157,7 @@ action :create do
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"

-    on_unit_inactive_sec "30m"
+    on_unit_inactive_sec "6h"

     randomized_delay_sec "20m"
     not_if { new_resource.uses_tiler }
   end
     randomized_delay_sec "20m"
     not_if { new_resource.uses_tiler }
   end