Move application.yml check to config initializer

This commit is contained in:
Tom Hughes 2019-03-17 10:49:21 +00:00
parent 141df02e67
commit e7ab3de654
2 changed files with 17 additions and 13 deletions

View file

@ -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"

View file

@ -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