X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/be5d0a460d25ba8c45e4ea25c754a7b52fd53c64..ae60e569aa65b63bf638f6e216a47156673c8c9b:/cookbooks/web/resources/rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 1aeac0139..4c3de7489 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -66,6 +66,7 @@ property :totp_key, String
 property :csp_enforce, [TrueClass, FalseClass], :default => false
 property :csp_report_url, String
 property :piwik_configuration, Hash
+property :trace_use_job_queue, [TrueClass, FalseClass], :default => false
 
 action :create do
   package %W[
@@ -244,14 +245,6 @@ action :create do
       line.gsub!(/^( *)#wikipedia_auth_secret:.*$/, "\\1wikipedia_auth_secret: \"#{new_resource.wikipedia_auth_secret}\"")
     end
 
-    if new_resource.mapquest_key
-      line.gsub!(/^( *)#mapquest_key:.*$/, "\\1mapquest_key: \"#{new_resource.mapquest_key}\"")
-    end
-
-    if new_resource.mapzen_valhalla_key
-      line.gsub!(/^( *)#mapzen_valhalla_key:.*$/, "\\1mapzen_valhalla_key: \"#{new_resource.mapzen_valhalla_key}\"")
-    end
-
     if new_resource.thunderforest_key
       line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{new_resource.thunderforest_key}\"")
     end
@@ -282,23 +275,22 @@ action :create do
     mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
-    only_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
   end
 
   file "delete:#{rails_directory}/config/application.yml" do
     path "#{rails_directory}/config/application.yml"
     action :delete
-    not_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    not_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
   end
 
-  settings = new_resource.slice(
+  settings = new_resource.to_hash.transform_keys(&:to_s).slice(
     "email_from",
     "status",
     "messages_domain",
     "attachments_dir",
     "log_path",
     "logstash_path",
-    "memcache_servers",
     "potlatch2_key",
     "id_key",
     "oauth_key",
@@ -312,24 +304,28 @@ action :create do
     "windowslive_auth_id",
     "windowslive_auth_secret",
     "github_auth_id",
-    "gihub_auth_secret",
+    "github_auth_secret",
     "wikipedia_auth_id",
     "wikipedia_auth_secret",
     "thunderforest_key",
     "totp_key",
     "csp_enforce",
-    "csp_report_url"
-  ).merge(
+    "csp_report_url",
+    "trace_use_job_queue"
+  ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
-    "server" => new_resource.site,
+    "server_url" => new_resource.site,
     "publisher_url" => "https://plus.google.com/111953119785824514010",
     "support_email" => "support@openstreetmap.org",
     "email_return_path" => "bounces@openstreetmap.org",
     "geonames_username" => "openstreetmap",
-    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat",
-    "trace_use_job_queue" => false
+    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat"
   )
 
+  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"
@@ -341,7 +337,7 @@ action :create do
     mode 0o664
     content YAML.dump(settings)
     notifies :run, "execute[#{rails_directory}/public/assets]"
-    only_if { File.exist?("#{rails_directory}/config/settings.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/settings.yml") }
   end
 
   if new_resource.piwik_configuration