X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/030bb358cb08c1de277cafbb9df738c821624705..ae60e569aa65b63bf638f6e216a47156673c8c9b:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 90f36397e..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[ @@ -303,22 +304,22 @@ 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