X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0e57453d2b637a3d105d4e3d67031f3915f9d302..e39a7d5704932cbec606e85cdca50aa38a1ed053:/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 de9770d7b7..787469cca3 100644 --- a/services/api/config/initializers/load_config.rb +++ b/services/api/config/initializers/load_config.rb @@ -6,7 +6,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,9 +26,9 @@ $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) + confs = YAML.load(yaml, deserialize_symbols: true) # Ignore empty YAML file: next if confs == false $application_config.merge!(confs['common'] || {}) @@ -69,4 +69,5 @@ config/application.yml: EOS end + config.secret_key_base = config.secret_token end