[ARVADOS] updated: 1.3.0-623-gb076649ae

[Git user]

Summary of changes:
 build/run-library.sh                                   | 14 ++++++++++++++
 lib/config/{config.defaults.yml => config.default.yml} |  2 +-
 services/api/config/arvados_config.rb                  |  5 +++--
 services/api/config/config.defaults.yml                |  1 -
 4 files changed, 18 insertions(+), 4 deletions(-)
 rename lib/config/{config.defaults.yml => config.default.yml} (99%)
 delete mode 120000 services/api/config/config.defaults.yml

       via  b076649ae4540da0d83c8cbce633a58f5802ae37 (commit)
       via  f54f4cb519a5687f4f8a11913beb4248b451ef37 (commit)
      from  1eec7012611b33bfa2db0bbd067f45d5250639e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b076649ae4540da0d83c8cbce633a58f5802ae37
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Fri Apr 5 13:09:00 2019 -0400

    15042: handle config.default.yml in our packaging.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 1daceff23..01a6a06c1 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -352,6 +352,15 @@ handle_rails_package() {
     if  [[ "$pkgname" != "arvados-workbench" ]]; then
       exclude_list+=('config/database.yml')
     fi
+    # for arvados-api-server, we need to dereference the
+    # config/config.default.yml file. There is no fpm way to do that, sadly
+    # (excluding the existing symlink and then adding the file from its source
+    # path doesn't work, sadly.
+    if [[ "$pkgname" == "arvados-api-server" ]]; then
+      mv /arvados/services/api/config/config.default.yml /arvados/services/api/config/config.default.yml.bu
+      cp -p /arvados/lib/config/config.default.yml /arvados/services/api/config/
+      exclude_list+=('config/config.default.yml.bu')
+    fi
     for exclude in ${exclude_list[@]}; do
         switches+=(-x "$exclude_root/$exclude")
     done
@@ -359,6 +368,11 @@ handle_rails_package() {
               -x "$exclude_root/vendor/cache-*" \
               -x "$exclude_root/vendor/bundle" "$@" "$license_arg"
     rm -rf "$scripts_dir"
+    # Undo the deferencing we did above
+    if [[ "$pkgname" == "arvados-api-server" ]]; then
+      rm -f /arvados/services/api/config/config.default.yml
+      mv /arvados/services/api/config/config.default.yml.bu /arvados/services/api/config/config.default.yml
+    fi
 }
 
 # Build python packages with a virtualenv built-in

commit f54f4cb519a5687f4f8a11913beb4248b451ef37
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Fri Apr 5 13:07:00 2019 -0400

    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 at 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 3da6dc803..d46c5c0ae 100644
--- 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 b0ac7c0be..219455e32 100644
--- 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
index 3a43d4bcd..000000000
--- a/services/api/config/config.defaults.yml
+++ /dev/null
@@ -1 +0,0 @@
-../../../lib/config/config.defaults.yml
\ No newline at end of file

-----------------------------------------------------------------------


hooks/post-receive
--