X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d02429561da1d3ad2b5bbe0ac1108e8fc7774922..9e083ebce8a430d87164a3d790b3ff98fdf5c4e1:/cookbooks/imagery/resources/site.rb diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index e4c2c6f86..8aaef45ee 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -52,7 +52,14 @@ action :create do user "root" group "root" mode 0o644 - variables :title => title + 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 @@ -91,6 +98,38 @@ 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}"] } + %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 domains tile_domains end @@ -98,11 +137,27 @@ 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 +action :delete do + %w[0 1 2 3 4 5 6 7].each do |index| + service "mapserv-fcgi-#{new_resource.site}-#{index}" do + provider Chef::Provider::Service::Systemd + action [:stop, :disable] + end + + systemd_service "mapserv-fcgi-#{new_resource.site}-#{index}" do + action :delete + end + end + + nginx_site new_resource.site do + action :delete + end +end + def after_created notifies :reload, "service[nginx]" end