From: Tom Hughes <tom@compton.nu>
Date: Sun, 17 Mar 2019 11:59:39 +0000 (+0000)
Subject: Force memcache_servers to be a plain array
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/030bb358cb08c1de277cafbb9df738c821624705

Force memcache_servers to be a plain array
---

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 598c757fe..90f36397e 100644
--- 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",
@@ -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"