Merge pull request #4211 from tomhughes/changeset-comment-cleanup

[rails.git] / config / initializers / config.rb

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index f7d5d79249eb43243caabc463273871e98bee8b6..983f0226669327e394b8577e34ac9ab845fde488 100644 (file)
--- 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
@@ -74,8 +76,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