X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67e61331905f60ed0f9bab64ac57b5c4a5df9f36..afcb07ba438a01c65d701902dfcb39b04a0719ec:/cookbooks/imagery/resources/site.rb diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 699adbacb..856159be9 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -27,6 +27,7 @@ property :site, String, :name_property => true property :title, String, :required => [:create] property :aliases, [String, Array], :default => [] property :bbox, Array, :required => [:create] +property :uses_tiler, [true, false], :default => false action :create do directory "/srv/#{new_resource.site}" do @@ -86,7 +87,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 @@ -100,36 +101,19 @@ 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}"] } - # FIXME Clean up old service - service "mapserv-fcgi-#{new_resource.site}@" do - provider Chef::Provider::Service::Systemd - action [:stop, :disable] - end - - # FIXME Clean up old service - systemd_service "mapserv-fcgi-#{new_resource.site}@" do - action :delete - end - systemd_service "mapserv-fcgi-#{new_resource.site}" do description "Map server for #{new_resource.site} layer" - environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/", - "=" => "0", + environment "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/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv" + exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /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 + sandbox true + restrict_address_families "AF_UNIX" + not_if { new_resource.uses_tiler } end systemd_socket "mapserv-fcgi-#{new_resource.site}" do @@ -137,6 +121,7 @@ action :create do 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 @@ -145,11 +130,13 @@ action :create do 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_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 ssl_certificate new_resource.site do @@ -167,10 +154,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