[ARVADOS] updated: 1.3.0-1958-g9a62877a9

[Git user]

Summary of changes:
 build/rails-package-scripts/postinst.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  9b0e5e591c1266505d7d59e648550454647b85e5 (commit)
       via  9a62877a985fef90c729e6075076337e8d0600c0 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (9b0e5e591c1266505d7d59e648550454647b85e5)
            \
             N -- N -- N (9a62877a985fef90c729e6075076337e8d0600c0)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 9a62877a985fef90c729e6075076337e8d0600c0
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Dec 4 09:35:16 2019 -0500

    Stop adding application.yml and database.yml symlinks on fresh installs of the
    rails packages.
    
    refs #15904
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index 56d55d327..a06f8a8e9 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -186,10 +186,6 @@ configure_version() {
   setup_confdirs /etc/arvados "$CONFIG_PATH"
   setup_conffile environments/production.rb environments/production.rb.example \
       || true
-  setup_conffile application.yml application.yml.example || APPLICATION_READY=0
-  if [ -n "$RAILSPKG_DATABASE_LOAD_TASK" ]; then
-      setup_conffile database.yml database.yml.example || DATABASE_READY=0
-  fi
   setup_extra_conffiles
   echo "... done."
 
@@ -229,7 +225,7 @@ configure_version() {
   fi
 
   if [ 11 = "$RAILSPKG_SUPPORTS_CONFIG_CHECK$APPLICATION_READY" ]; then
-      run_and_report "Checking application.yml for completeness" \
+      run_and_report "Checking configuration for completeness" \
           $COMMAND_PREFIX bundle exec rake config:check || APPLICATION_READY=0
   fi
 
@@ -258,9 +254,9 @@ elif [ "$1" = "0" ] || [ "$1" = "1" ] || [ "$1" = "2" ]; then
   configure_version
 fi
 
-report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml"
 if printf '%s\n' "$CONFIG_PATH" | grep -Fqe "sso"; then
 	report_not_ready "$APPLICATION_READY" "$CONFIG_PATH/application.yml"
+	report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml"
 else
 	report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml"
 fi

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


hooks/post-receive
--