projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16669: Fix pass-through of cached remote token.
[arvados.git]
/
build
/
rails-package-scripts
/
arvados-api-server.sh
diff --git
a/build/rails-package-scripts/arvados-api-server.sh
b/build/rails-package-scripts/arvados-api-server.sh
index c2b99f0fe028cae696baad5c8569069edd4153e9..027383ab4f62294aa9661b5e9ce1651457f3bf1a 100644
(file)
--- a/
build/rails-package-scripts/arvados-api-server.sh
+++ b/
build/rails-package-scripts/arvados-api-server.sh
@@
-1,4
+1,8
@@
#!/bin/sh
#!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
# This file declares variables common to all scripts for one Rails package.
PACKAGE_NAME=arvados-api-server
# This file declares variables common to all scripts for one Rails package.
PACKAGE_NAME=arvados-api-server
@@
-8,14
+12,16
@@
DOC_URL="http://doc.arvados.org/install/install-api-server.html#configure"
RAILSPKG_DATABASE_LOAD_TASK=db:structure:load
setup_extra_conffiles() {
RAILSPKG_DATABASE_LOAD_TASK=db:structure:load
setup_extra_conffiles() {
- setup_conffile initializers/omniauth.rb
+ # 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
# usually /var/lib/arvados/internal.git (set in application.default.yml )
if [ "$APPLICATION_READY" = "1" ]; then
}
setup_before_nginx_restart() {
# initialize git_internal_dir
# usually /var/lib/arvados/internal.git (set in application.default.yml )
if [ "$APPLICATION_READY" = "1" ]; then
- GIT_INTERNAL_DIR=$($COMMAND_PREFIX bundle exec rake config:
check 2>&1 | grep git_internal_dir | awk '{ print $2 }
')
+ GIT_INTERNAL_DIR=$($COMMAND_PREFIX bundle exec rake config:
dump 2>&1 | grep GitInternalDir | awk '{ print $2 }' |tr -d '"
')
if [ ! -e "$GIT_INTERNAL_DIR" ]; then
run_and_report "Creating git_internal_dir '$GIT_INTERNAL_DIR'" \
mkdir -p "$GIT_INTERNAL_DIR"
if [ ! -e "$GIT_INTERNAL_DIR" ]; then
run_and_report "Creating git_internal_dir '$GIT_INTERNAL_DIR'" \
mkdir -p "$GIT_INTERNAL_DIR"