13996: rename config.defaults.yml to config.default.yml, to remain consistent

with our existing default files.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/lib/config/config.defaults.yml b/lib/config/config.default.yml
similarity index 99%
rename from lib/config/config.defaults.yml
rename to lib/config/config.default.yml
index 3da6dc803f2753712909f018e35bfa17722f6c43..d46c5c0ae1b3cbfddeb7f830c460ce8c4f9335e3 100644 (file)
--- a/lib/config/config.defaults.yml
+++ b/lib/config/config.default.yml
@@ -8,7 +8,7 @@
 # The order of precedence (highest to lowest):
 # 1. Legacy component-specific config files (deprecated)
 # 2. /etc/arvados/config.yml
-# 3. config.defaults.yml
+# 3. config.default.yml
 
 Clusters:
   xxxxx:

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index b0ac7c0be2dbe9a68883aea96b8164d38a184c22..219455e32205a513fe17a57d406e8c95d827a574 100644 (file)
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 #
-# Load Arvados configuration from /etc/arvados/config.yml, using defaults from config.defaults.yml
+# Load Arvados configuration from /etc/arvados/config.yml, using defaults
+# from config.default.yml
 #
 # Existing application.yml is migrated into the new config structure.
 # Keys in the legacy application.yml take precedence.
@@ -43,7 +44,7 @@ end
 
 $arvados_config = {}
 
-["#{::Rails.root.to_s}/config/config.defaults.yml", "/etc/arvados/config.yml"].each do |path|
+["#{::Rails.root.to_s}/config/config.default.yml", "/etc/arvados/config.yml"].each do |path|
   if File.exist? path
     confs = YAML.load(IO.read(path), deserialize_symbols: false)
     if confs

diff --git a/services/api/config/config.defaults.yml b/services/api/config/config.defaults.yml
deleted file mode 120000 (symlink)
index 3a43d4b..0000000
--- a/services/api/config/config.defaults.yml
+++ /dev/null
@@ -1 +0,0 @@
-../../../lib/config/config.defaults.yml
\ No newline at end of file