Reduce maximum multixact age for promscale

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index ba3f06aaade7928d232a54b74a0a6e9e038c207a..90028e9f9833a272b12873b3bf4031443bf26a12 100644 (file)
--- 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