X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4b7c0f2aa4da6fdb25419a24d1a7f5b57ab35bfd..0eb72b526bf8bbb011551ecf019f604e17a534f1:/services/api/config/initializers/load_config.rb diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb index 76234d3e4b..16059cad76 100644 --- a/services/api/config/initializers/load_config.rb +++ b/services/api/config/initializers/load_config.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + begin # If secret_token.rb exists here, we need to load it first. require_relative 'secret_token.rb' @@ -6,7 +10,7 @@ rescue LoadError # configured by application.yml (i.e., here!) instead. end -if (File.exists?(File.expand_path '../omniauth.rb', __FILE__) and +if (File.exist?(File.expand_path '../omniauth.rb', __FILE__) and not defined? WARNED_OMNIAUTH_CONFIG) Rails.logger.warn <<-EOS DEPRECATED CONFIGURATION: @@ -26,7 +30,7 @@ $application_config = {} %w(application.default application).each do |cfgfile| path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml" - if File.exists? path + if File.exist? path yaml = ERB.new(IO.read path).result(binding) confs = YAML.load(yaml, deserialize_symbols: true) # Ignore empty YAML file: @@ -69,4 +73,5 @@ config/application.yml: EOS end + config.secret_key_base = config.secret_token end