Merge remote-tracking branch 'upstream/pull/2637'

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

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index 80997e0dc90ac455f018fcf88bc7603cf09141ad..b74ba57e635340cb82c9335abbe0de89f5f6df41 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -1,3 +1,20 @@
+# 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 ||= [
   "online",            # online and operating normally
@@ -60,5 +77,6 @@ Config.setup do |config|
     required(:api_timeout).filled(:int?)
     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
+    required(:storage_service).filled(:str?)
   end
 end