Start job processes for the traces queue on primary backends

[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 90f36397e85a981f9e2b6bd8d755d3a407751388..f86c481452dbc001d07885b3441d3a23adf4f452 100644 (file)
--- 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[
@@ -309,16 +310,16 @@ action :create do
     "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