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 f8ee4ca2e1b09d8c5dfcddc21489129b0469de32..90028e9f9833a272b12873b3bf4031443bf26a12 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -73,6 +73,7 @@ property :diary_feed_delay, Integer
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"
 property :storage_url, String
+property :tile_cdn_url, String
 
 action :create do
   package %W[
@@ -85,6 +86,7 @@ action :create do
 
   package %w[
     g++
+    make
     pkg-config
     libpq-dev
     libsasl2-dev
@@ -318,8 +320,9 @@ action :create do
     "trace_use_job_queue",
     "diary_feed_delay",
     "storage_service",
-    "storage_url"
-  ).reject { |_k, v| v.nil? }.merge(
+    "storage_url",
+    "tile_cdn_url"
+  ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
     "support_email" => "support@openstreetmap.org",
@@ -445,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