From f7a188f47e729ecb0a53012ce4b238a6904a3358 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 14 Jul 2019 19:23:16 +0100 Subject: [PATCH 1/1] Always confgure a local storage service --- cookbooks/web/resources/rails_port.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 7eac0df88..189c01bbf 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -68,7 +68,7 @@ property :csp_report_url, String property :piwik_configuration, Hash property :trace_use_job_queue, [TrueClass, FalseClass], :default => false property :diary_feed_delay, Integer -property :storage_configuration, Hash +property :storage_configuration, Hash, :default => {} property :storage_service, String, :default => "local" property :storage_url, String @@ -350,12 +350,12 @@ action :create do only_if { ::File.exist?("#{rails_directory}/config/settings.yml") } end - storage_configuration = new_resource.storage_configuration || { + storage_configuration = new_resource.storage_configuration.merge( "local" => { "service" => "Disk", "root" => "#{rails_directory}/storage" } - } + ) file "#{rails_directory}/config/storage.yml" do owner new_resource.user -- 2.43.2