X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d058d9fb0695302bf5f79630bdf1f465f8ed1da0..642f37a2ec824092d39045d09c0a9a190ddb4182:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index ba3f06aaa..90028e9f9 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -322,7 +322,7 @@ action :create do "storage_service", "storage_url", "tile_cdn_url" - ).reject { |_k, v| v.nil? }.merge( + ).compact.merge( "server_protocol" => "https", "server_url" => new_resource.site, "support_email" => "support@openstreetmap.org", @@ -448,6 +448,7 @@ action :create do file "#{rails_directory}/public/export/embed.html" do action :nothing subscribes :delete, "git[#{rails_directory}]" + subscribes :delete, "file[#{rails_directory}/config/settings.local.yml]" end passenger_application rails_directory do