From f32deb7586783a24dd419329975f1d9429728d29 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Thu, 23 Jul 2015 10:07:54 -0400 Subject: [PATCH 1/1] 6750: arvados-api-server-upgrade only installs omniauth.rb if it exists. New installs configure the SSO server via application.yml. Refs #6750. --- .../arvados-api-server-extras/arvados-api-server-upgrade.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh index ace07c7259..5160c7ac5f 100755 --- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh +++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh @@ -39,7 +39,9 @@ echo "Copying files from $CONFIG_PATH" cp -f $CONFIG_PATH/database.yml $RELEASE_PATH/config/database.yml cp -f $RELEASE_PATH/config/environments/production.rb.example $RELEASE_PATH/config/environments/production.rb cp -f $CONFIG_PATH/application.yml $RELEASE_PATH/config/application.yml -cp -f $CONFIG_PATH/omniauth.rb $RELEASE_PATH/config/initializers/omniauth.rb +if [ -e $CONFIG_PATH/omniauth.rb ]; then + cp -f $CONFIG_PATH/omniauth.rb $RELEASE_PATH/config/initializers/omniauth.rb +fi echo "Done." # Before we do anything else, make sure some directories and files are in place -- 2.30.2