X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..496a872f02e9446533bc6dfb8b4ac3fd91bf3cf2:/config/initializers/config.rb?ds=inline diff --git a/config/initializers/config.rb b/config/initializers/config.rb index e51281e11..f36e6ac1a 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,14 +16,16 @@ end # rubocop:enable Rails/Output, Rails/Exit # Allowed status values -ALLOWED_STATUS = [ - "online", # online and operating normally - "api_readonly", # site online but API in read-only mode - "api_offline", # site online but API offline - "database_readonly", # database and site in read-only mode - "database_offline", # database offline with site in emergency mode - "gpx_offline" # gpx storage offline -].freeze +unless Object.const_defined?(: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 + "database_readonly", # database and site in read-only mode + "database_offline", # database offline with site in emergency mode + "gpx_offline" # gpx storage offline + ].freeze +end Config.setup do |config| # Name of the constant exposing loaded settings @@ -75,7 +77,9 @@ Config.setup do |config| required(:tracepoints_per_page).filled(:int?) required(:max_number_of_way_nodes).filled(:int?) required(:max_number_of_relation_members).filled(:int?) + required(:max_issues_count).filled(:int?) required(:api_timeout).filled(:int?) + required(:user_account_deletion_delay).maybe(:number?) required(:imagery_blacklist).maybe(:array?) required(:status).filled(:str?, :included_in? => ALLOWED_STATUS) required(:avatar_storage).filled(:str?)