projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14873: Fixes parameter handling (WIP)
[arvados.git]
/
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 de9770d7b7d1b45d7466b87b93f1e2fee9e9afab..16059cad76f9afb2350dfa961dd9fd1877fd480a 100644
(file)
--- 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'
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
# configured by application.yml (i.e., here!) instead.
end
-if (File.exist
s
?(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:
not defined? WARNED_OMNIAUTH_CONFIG)
Rails.logger.warn <<-EOS
DEPRECATED CONFIGURATION:
@@
-26,9
+30,9
@@
$application_config = {}
%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
- if File.exist
s
? path
+ if File.exist? path
yaml = ERB.new(IO.read path).result(binding)
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'] || {})
# Ignore empty YAML file:
next if confs == false
$application_config.merge!(confs['common'] || {})
@@
-69,4
+73,5
@@
config/application.yml:
EOS
end
EOS
end
+ config.secret_key_base = config.secret_token
end
end