X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cb186f3b6d9c9777d8f17ec95f56daf3e46693f4..aacf3583672d248da790719305dffdf6f8bd31e7:/cookbooks/imagery/resources/site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 40d6ae62f..97163ee3e 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -55,6 +55,13 @@ action :create do
     variables :title => new_resource.title
   end
 
+  cookbook_file "/srv/#{new_resource.site}/robots.txt" do
+    source "robots.txt"
+    user "root"
+    group "root"
+    mode 0o644
+  end
+
   cookbook_file "/srv/#{new_resource.site}/imagery.css" do
     source "imagery.css"
     user "root"
@@ -91,34 +98,36 @@ 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}"] }
 
-  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" => "256"
-    limit_nofile 16384
-    memory_high "512M"
-    memory_max "1G"
-    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 128 -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"
-  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
+      limit_cpu 60
+      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
   end
 
   ssl_certificate new_resource.site do
@@ -135,6 +144,7 @@ end
 
 action :delete do
   service "mapserv-fcgi-#{new_resource.site}" do
+    provider Chef::Provider::Service::Systemd
     action [:stop, :disable]
   end