imagery: switch from multiwatch to seperate daemons

diff --git a/cookbooks/imagery/recipes/na_sgswa_topo.rb b/cookbooks/imagery/recipes/na_sgswa_topo.rb
index 7b4ac37498ba191faceb8412cd0f5c3e7de15bbc..182cc75452af4bb1c42b0c60b8861ef3869e0c66 100644 (file)
--- a/cookbooks/imagery/recipes/na_sgswa_topo.rb
+++ b/cookbooks/imagery/recipes/na_sgswa_topo.rb
@@ -30,7 +30,7 @@ imagery_layer "na_sgswa_topo_50k" do
   title "Namibia Topo 50k"
   projection "EPSG:4326"
   source "/data/imagery/na/topo-50k/namibia-50k-topo.vrt"
-  copyright 'State Copyright &copy 1958 - 1991; Surveyor-General, Windhoek, SWA; CDSM: Chief Directorate Surveys & Mapping, Mowbray, RSA'
+  copyright "State Copyright &copy 1958 - 1991; Surveyor-General, Windhoek, SWA; CDSM: Chief Directorate Surveys & Mapping, Mowbray, RSA"
   default_layer true
   background_colour "0 0 0"
   extension "jpeg"

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index daa517af7d23ac2fb4818fae7f44df2b738fb7a6..53c954e8d64fdeab5b3b3574c24f91ced7c3b6a4 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -98,33 +98,44 @@ 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}"] }
 
+  service "mapserv-fcgi-#{new_resource.site}" do
+    provider Chef::Provider::Service::Systemd
+    action [:stop, :disable]
+  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_max "2G"
-    user "imagery"
-    group "imagery"
-    exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
-    exec_start "/usr/bin/spawn-fcgi -n -b 8192 -s /run/mapserver-fastcgi/layer-#{new_resource.site}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.site}.pid -- /usr/bin/multiwatch -f 8 --signal=TERM -- /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}.pid"
+    action :delete
   end
 
-  service "mapserv-fcgi-#{new_resource.site}" 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}]"
+  %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
+      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
   end
 
   ssl_certificate new_resource.site do
@@ -141,6 +152,7 @@ end
 
 action :delete do
   service "mapserv-fcgi-#{new_resource.site}" do
+    provider Chef::Provider::Service::Systemd
     action [:stop, :disable]
   end
 

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index 9d21be6b03a1348678bd8fa4e5ee47145fb056f1..e5d3dac5621eb87bd2914627f35df918f6f6b9e2 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -8,14 +8,14 @@ server {
 }
 
 upstream <%= @name %>_fastcgi {
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
-    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-0.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-1.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-2.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-3.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-4.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-5.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-6.socket" max_fails=0;
+    server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-7.socket" max_fails=0;
     least_conn;
 }