From e7ab3de654be6d0d1877eaf031baffa66bc1ed24 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 17 Mar 2019 10:49:21 +0000 Subject: [PATCH] Move application.yml check to config initializer --- config/application.rb | 13 ------------- config/initializers/config.rb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/config/application.rb b/config/application.rb index a8a13c476..3b470bacc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,18 +1,5 @@ require_relative "boot" -# 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?(File.expand_path("application.yml", __dir__)) - puts "The config/application.yml file is no longer supported" - puts "Default settings are now found in config/settings.yml and you can override these in config/settings.local.yml" - puts "To prevent unexpected behaviour, please copy any custom settings to config/settings.local.yml" - puts " and then remove your config/application.yml file." - exit! -end -# rubocop:enable Rails/Output, Rails/Exit - if ENV["OPENSTREETMAP_STATUS"] == "database_offline" require "active_model/railtie" require "active_job/railtie" diff --git a/config/initializers/config.rb b/config/initializers/config.rb index 80997e0dc..f7d5d7924 100644 --- 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 -- 2.39.5