[ARVADOS-DEV] updated: f32deb7586783a24dd419329975f1d9429728d29

[git at public.curoverse.com]

Summary of changes:
 jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  f32deb7586783a24dd419329975f1d9429728d29 (commit)
      from  c31cdc09ae6aefbbf6f9e14b3c6fdf910a729b29 (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 f32deb7586783a24dd419329975f1d9429728d29
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 23 10:07:54 2015 -0400

    6750: arvados-api-server-upgrade only installs omniauth.rb if it exists.
    
    New installs configure the SSO server via application.yml.  Refs #6750.

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 ace07c7..5160c7a 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

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


hooks/post-receive
--