X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/87daa0d823c8f92eda8190f2d9b482b3d85a7a0c..8dd0d530c008e40e4320621f34d6137b9757cf3c:/cookbooks/imagery/resources/site.rb?ds=inline

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 50bfd24b8..4fca7bb9a 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -19,6 +19,8 @@
 
 require "yaml"
 
+unified_mode true
+
 default_action :create
 
 property :site, String, :name_property => true
@@ -84,7 +86,7 @@ action :create do
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
-    YAML.safe_load(::File.read(path), [Symbol])
+    YAML.safe_load(::File.read(path), :permitted_classes => [Symbol])
   end
 
   declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do
@@ -98,36 +100,43 @@ action :create do
   base_domains = [new_resource.site] + Array(new_resource.aliases)
   tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
 
-  %w[0 1 2 3 4 5 6 7].each do |index|
-    systemd_service "mapserv-fcgi-#{new_resource.site}-#{index}" do
-      description "Map server for #{new_resource.site} layer"
-      environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
-                  "MS_DEBUGLEVEL" => "0",
-                  "MS_ERRORFILE" => "stderr",
-                  "GDAL_CACHEMAX" => "512"
-      limit_nofile 16384
-      limit_cpu 180
-      memory_max "4G"
-      user "imagery"
-      group "imagery"
-      exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket"
-      exec_start "/usr/bin/spawn-fcgi -n -b 8192 -s /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.pid -- /usr/lib/cgi-bin/mapserv"
-      private_tmp true
-      private_devices true
-      private_network true
-      protect_system "full"
-      protect_home true
-      no_new_privileges true
-      restart "always"
-      pid_file "/run/mapserver-fastcgi/layer-#{new_resource.site}-#{index}.pid"
-    end
-
-    service "mapserv-fcgi-#{new_resource.site}-#{index}" do
-      provider Chef::Provider::Service::Systemd
-      action [:enable, :start]
-      supports :status => true, :restart => true, :reload => false
-      subscribes :restart, "systemd_service[mapserv-fcgi-#{new_resource.site}-#{index}]"
-    end
+  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",
+                "MS_ERRORFILE" => "stderr",
+                "GDAL_CACHEMAX" => "512"
+    limit_nofile 16384
+    memory_high "1G"
+    memory_max "4G"
+    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"
+    # Terminate service after 30mins. Service is socket activated
+    runtime_max_sec 1800
+  end
+
+  systemd_socket "mapserv-fcgi-#{new_resource.site}" do
+    description "Map server for #{new_resource.site} layer 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
+  service "mapserv-fcgi-#{new_resource.site}" do
+    provider Chef::Provider::Service::Systemd
+    action :nothing
+    subscribes :stop, "systemd_service[mapserv-fcgi-#{new_resource.site}]"
+    subscribes :stop, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
+  end
+
+  systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do
+    action [:enable, :start]
+    subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]"
   end
 
   ssl_certificate new_resource.site do
@@ -142,15 +151,13 @@ action :create do
 end
 
 action :delete do
-  %w[0 1 2 3 4 5 6 7].each do |index|
-    service "mapserv-fcgi-#{new_resource.site}-#{index}" do
-      provider Chef::Provider::Service::Systemd
-      action [:stop, :disable]
-    end
-
-    systemd_service "mapserv-fcgi-#{new_resource.site}-#{index}" do
-      action :delete
-    end
+  service "mapserv-fcgi-#{new_resource.site}" do
+    provider Chef::Provider::Service::Systemd
+    action [:stop, :disable]
+  end
+
+  systemd_service "mapserv-fcgi-#{new_resource.site}" do
+    action :delete
   end
 
   nginx_site new_resource.site do