X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f3661da687dc11ec6d0c40a12d43723d71f4503e..b9c09caa3be92017a71270447f83ab714b13055b:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 27cb3b02f..4825307b2 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -85,6 +85,7 @@ property :avatar_storage_url, String property :trace_image_storage_url, String property :trace_icon_storage_url, String property :tile_cdn_url, String +property :imagery_blacklist, Array action :create do package %W[ @@ -334,14 +335,15 @@ action :create do "avatar_storage_url", "trace_image_storage_url", "trace_icon_storage_url", - "tile_cdn_url" + "tile_cdn_url", + "imagery_blacklist" ).compact.merge( "server_protocol" => "https", "server_url" => new_resource.site, "support_email" => "support@openstreetmap.org", "email_return_path" => "bounces@openstreetmap.org", "geonames_username" => "openstreetmap", - "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb", + "maxmind_database" => "#{node[:geoipupdate][:directory]}/GeoLite2-Country.mmdb", "max_request_area" => node[:web][:max_request_area], "max_number_of_nodes" => node[:web][:max_number_of_nodes], "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],