[ARVADOS] updated: 1.3.0-2938-g586e1c558

[Git user]

Summary of changes:
 build/rails-package-scripts/arvados-api-server.sh | 5 +++++
 1 file changed, 5 insertions(+)

       via  586e1c558c1fdfac7f4e5fefa6544c3ba59341f2 (commit)
      from  3bcdb62498359a51bb45aa0e163faebf2803b802 (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 586e1c558c1fdfac7f4e5fefa6544c3ba59341f2
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Aug 19 09:16:07 2020 -0400

    Actively remove initializers/omniauth.rb in our rails package for the
    API server. It has been a dangling symlink for a long time, and Rails
    5.2 is no longer forgiving of that.
    
    refs #16470
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/rails-package-scripts/arvados-api-server.sh b/build/rails-package-scripts/arvados-api-server.sh
index 2504ff85d..027383ab4 100644
--- a/build/rails-package-scripts/arvados-api-server.sh
+++ b/build/rails-package-scripts/arvados-api-server.sh
@@ -11,6 +11,11 @@ CONFIG_PATH=/etc/arvados/api
 DOC_URL="http://doc.arvados.org/install/install-api-server.html#configure"
 
 RAILSPKG_DATABASE_LOAD_TASK=db:structure:load
+setup_extra_conffiles() {
+  # Rails 5.2 does not tolerate dangling symlinks in the initializers directory, and this one
+  # can still be there, left over from a previous version of the API server package.
+  rm -f $RELEASE_PATH/config/initializers/omniauth.rb
+}
 
 setup_before_nginx_restart() {
   # initialize git_internal_dir

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


hooks/post-receive
--