X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d058d9fb0695302bf5f79630bdf1f465f8ed1da0..64d9f0a80c133eb486067b019f82499060a4767c:/cookbooks/web/resources/rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index ba3f06aaa..e0c9cad91 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -22,6 +22,8 @@ require "yaml"
 resource_name :rails_port
 provides :rails_port
 
+unified_mode true
+
 default_action :create
 
 property :site, String, :name_property => true
@@ -322,7 +324,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 +450,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