Allow prometheus collectors write access to /var/log

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 5c6f0592756b1b5a54624d820b4394c1856265c2..14cb2842edf304894bb9ae337e9e2e9e2b3db35e 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -103,15 +103,15 @@ action :create do
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"
     environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"
     environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",

-                "MS_DEBUGLEVEL" => "0",
+                "=" => "0",

                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

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

     user "imagery"
     group "imagery"
     user "imagery"
     group "imagery"

-    exec_start "/usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/multiwatch -f 12 --signal=TERM -- /usr/lib/cgi-bin/mapserv"

     standard_input "socket"
     private_tmp true
     private_devices true
     standard_input "socket"
     private_tmp true
     private_devices true


@@ -119,6 +119,8 @@ action :create do
     protect_system "full"
     protect_home true
     no_new_privileges true
     protect_system "full"
     protect_home true
     no_new_privileges true

+    # Terminate service after 5mins. Service is socket activated
+    runtime_max_sec 300

   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do
   end
 
   systemd_socket "mapserv-fcgi-#{new_resource.site}" do


@@ -126,7 +128,6 @@ action :create do
     socket_user "imagery"
     socket_group "imagery"
     listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
     socket_user "imagery"
     socket_group "imagery"
     listen_stream "/run/mapserver-fastcgi/layer-#{new_resource.site}.socket"

-

   end
 
   # Ensure service is stopped because otherwise the socket cannot reload
   end
 
   # Ensure service is stopped because otherwise the socket cannot reload