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
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
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"
+ timeout_stop_sec 60
+ not_if { new_resource.uses_tiler }
end
systemd_socket "mapserv-fcgi-#{new_resource.site}" 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
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
+
+ # 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
+
+ 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
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