X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e5f294d3dc676675b2803915571c28337468c3b3..77c15edb86c1c5a78904db4da60a4806cc3e1bb6:/cookbooks/imagery/resources/site.rb diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index d159a7ac3..97163ee3e 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -8,7 +8,7 @@ # 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, @@ -47,12 +47,19 @@ action :create do recursive true end - template "/srv/#{new_resource.site}/index.html" do + declare_resource :template, "/srv/#{new_resource.site}/index.html" do source "index.html.erb" 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 @@ -80,7 +87,7 @@ action :create do YAML.safe_load(::File.read(path), [Symbol]) end - template "/srv/#{new_resource.site}/imagery.js" do + declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do source "imagery.js.erb" user "root" group "root" @@ -91,19 +98,62 @@ 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}"] } - ssl_certificate new_resource.site do - domains tile_domains + %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 - resolvers = node[:networking][:nameservers].map do |resolver| - IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver + ssl_certificate new_resource.site do + domains tile_domains end nginx_site new_resource.site do - template_source "nginx_imagery.conf.erb" + template "nginx_imagery.conf.erb" directory "/srv/imagery/#{new_resource.site}" restart_nginx false - variables new_resource.to_hash.merge(:resolvers => resolvers) + variables new_resource.to_hash + end +end + +action :delete do + service "mapserv-fcgi-#{new_resource.site}" do + provider Chef::Provider::Service::Systemd + action [:stop, :disable] + end + + systemd_service "mapserv-fcgi-#{new_resource.site}" do + action :delete + end + + nginx_site new_resource.site do + action :delete end end