X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/586b336d1a0694e30df05846adb641b5df710f71..f65e6e5bdfdab789a385847963b9c1ffa799a6e3:/cookbooks/web/resources/rails_port.rb?ds=sidebyside diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 2a6528cd1..90028e9f9 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -86,6 +86,7 @@ action :create do package %w[ g++ + make pkg-config libpq-dev libsasl2-dev @@ -321,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", @@ -447,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