X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/14aaf5f1b1075092352779a5ae8245dc9e01f432..9c080effa5bab5aa01d3c911e32e938123a29787:/cookbooks/imagery/resources/site.rb?ds=sidebyside

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 10c6fb449..11bb8b646 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
@@ -98,37 +100,46 @@ 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_high "1G"
-      memory_max "2G"
-      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 "512M"
+    memory_max "1G"
+    user "imagery"
+    group "imagery"
+    exec_start "/usr/lib/cgi-bin/mapserv"
+    standard_input "socket"
+    private_tmp true
+    private_devices true
+    private_network true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+  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 else 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
@@ -143,15 +154,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