X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d45bc53eef2534330416e79e547c1b5f3dca60ff..19f8f66503a29673ef20dc47d9daa7b228e81c80:/cookbooks/imagery/resources/site.rb?ds=inline diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 53c954e8d..83926229a 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: imagery +# Cookbook:: imagery # Resource:: imagery_site # -# Copyright 2016, OpenStreetMap Foundation +# Copyright:: 2016, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,31 +19,34 @@ require "yaml" +unified_mode true + default_action :create property :site, String, :name_property => true -property :title, String, :required => true +property :title, String, :required => [:create] property :aliases, [String, Array], :default => [] -property :bbox, Array, :required => true +property :bbox, Array, :required => [:create] +property :uses_tiler, [true, false], :default => false action :create do directory "/srv/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" end directory "/srv/imagery/layers/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" recursive true end directory "/srv/imagery/overlays/#{new_resource.site}" do user "root" group "root" - mode 0o755 + mode "755" recursive true end @@ -51,7 +54,7 @@ action :create do source "index.html.erb" user "root" group "root" - mode 0o644 + mode "644" variables :title => new_resource.title end @@ -59,83 +62,104 @@ action :create do source "robots.txt" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/imagery.css" do source "imagery.css" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do source "clientaccesspolicy.xml" user "root" group "root" - mode 0o644 + mode "644" end cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do source "crossdomain.xml" user "root" group "root" - mode 0o644 + mode "644" 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 source "imagery.js.erb" user "root" group "root" - mode 0o644 + mode "644" variables :bbox => new_resource.bbox, :layers => layers end 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_DEBUGLEVEL" => "0", + "MS_ERRORFILE" => "stderr", + "GDAL_CACHEMAX" => "512" + limit_nofile 16384 + 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" + timeout_stop_sec 60 + not_if { new_resource.uses_tiler } + 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" + not_if { new_resource.uses_tiler } + end + + # Ensure service is stopped because otherwise the socket cannot reload service "mapserv-fcgi-#{new_resource.site}" do provider Chef::Provider::Service::Systemd - action [:stop, :disable] + action :nothing + subscribes :stop, "systemd_service[mapserv-fcgi-#{new_resource.site}]" + subscribes :stop, "systemd_socket[mapserv-fcgi-#{new_resource.site}]" + not_if { new_resource.uses_tiler } end - systemd_service "mapserv-fcgi-#{new_resource.site}" do - action :delete + systemd_unit "mapserv-fcgi-#{new_resource.site}.socket" do + action [:enable, :start] + subscribes :restart, "systemd_socket[mapserv-fcgi-#{new_resource.site}]" + not_if { new_resource.uses_tiler } + end + + # mapserver leaks memory, so restart it regularly. It is activated automatically by socket + systemd_service "mapserv-fcgi-#{new_resource.site}-stop" do + type "simple" + user "root" + exec_start "/bin/systemctl --quiet stop mapserv-fcgi-#{new_resource.site}.service" + sandbox true + restrict_address_families "AF_UNIX" + not_if { new_resource.uses_tiler } + end + + systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do + on_boot_sec "10m" + on_unit_inactive_sec "1h" + randomized_delay_sec "30m" + not_if { new_resource.uses_tiler } end - %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 + service "mapserv-fcgi-#{new_resource.site}-stop.timer" do + action [:enable, :start] + not_if { new_resource.uses_tiler } end ssl_certificate new_resource.site do @@ -145,7 +169,6 @@ action :create do nginx_site new_resource.site do template "nginx_imagery.conf.erb" directory "/srv/imagery/#{new_resource.site}" - restart_nginx false variables new_resource.to_hash end end @@ -154,10 +177,12 @@ action :delete do service "mapserv-fcgi-#{new_resource.site}" do provider Chef::Provider::Service::Systemd action [:stop, :disable] + not_if { new_resource.uses_tiler } end systemd_service "mapserv-fcgi-#{new_resource.site}" do action :delete + not_if { new_resource.uses_tiler } end nginx_site new_resource.site do