X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dcfe326f6515cc7aeb9c02b7536e69863c60cd01..007e1b26cd293686ab6236750db41bd5fb1cf5a1:/config/initializers/config.rb?ds=sidebyside diff --git a/config/initializers/config.rb b/config/initializers/config.rb index f7d5d7924..7fc488635 100644 --- a/config/initializers/config.rb +++ b/config/initializers/config.rb @@ -2,7 +2,7 @@ # Otherwise, admins might not be aware that they are now silently ignored # and major problems could occur # rubocop:disable Rails/Output, Rails/Exit -if File.exist?(Rails.root.join("config", "application.yml")) +if Rails.root.join("config/application.yml").exist? puts "The config/application.yml file is no longer supported." puts "" puts "Default settings are now found in config/settings.yml and you" @@ -16,7 +16,7 @@ end # rubocop:enable Rails/Output, Rails/Exit # Allowed status values -ALLOWED_STATUS ||= [ +ALLOWED_STATUS = [ "online", # online and operating normally "api_readonly", # site online but API in read-only mode "api_offline", # site online but API offline @@ -74,8 +74,13 @@ Config.setup do |config| required(:max_note_request_area).filled(:number?) required(:tracepoints_per_page).filled(:int?) required(:max_number_of_way_nodes).filled(:int?) + required(:max_number_of_relation_members).filled(:int?) required(:api_timeout).filled(:int?) required(:imagery_blacklist).maybe(:array?) required(:status).filled(:str?, :included_in? => ALLOWED_STATUS) + required(:avatar_storage).filled(:str?) + required(:trace_file_storage).filled(:str?) + required(:trace_image_storage).filled(:str?) + required(:trace_icon_storage).filled(:str?) end end