Ignore properties with no value

[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 598c757fed78bda03ed202c7a3bb944a0da68d0a..de6f97ad8ae4936d8ba412e985839fe3fcc4b9ef 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -290,7 +290,6 @@ action :create do
     "attachments_dir",
     "log_path",
     "logstash_path",
-    "memcache_servers",
     "potlatch2_key",
     "id_key",
     "oauth_key",
@@ -311,7 +310,7 @@ action :create do
     "totp_key",
     "csp_enforce",
     "csp_report_url"
-  ).merge(
+  ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
     "server" => new_resource.site,
     "publisher_url" => "https://plus.google.com/111953119785824514010",
@@ -322,6 +321,10 @@ action :create do
     "trace_use_job_queue" => false
   )
 
+  if new_resource.memcache_servers
+    settings["memcache_servers"] = new_resource.memcache_servers.to_a
+  end
+
   if new_resource.gpx_dir
     settings["gpx_trace_dir"] = "#{new_resource.gpx_dir}/traces"
     settings["gpx_image_dir"] = "#{new_resource.gpx_dir}/images"