X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/141df02e671d7c559f6d813bde1d792a159f1875..0322ed4295702d5842632af959ecf1ae00fa1983:/config/initializers/config.rb?ds=inline

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index 80997e0dc..e51281e11 100644
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -1,5 +1,22 @@
+# Guard against deployments with old-style application.yml configurations
+# 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"))
+  puts "The config/application.yml file is no longer supported."
+  puts ""
+  puts "Default settings are now found in config/settings.yml and you"
+  puts "can override these in config/settings.local.yml."
+  puts ""
+  puts "To prevent unexpected behaviour, please copy any custom"
+  puts "settings to config/settings.local.yml and then remove"
+  puts "your config/application.yml file."
+  exit!
+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
@@ -57,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