projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to upload InputStream to KeepWebApi
[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 6d11ea864ccf30496123cae696e09a3246d1c5be..a0e356ce327cba01b876b1330c7430462c317542 100644
(file)
--- a/
build/rails-package-scripts/arvados-api-server.sh
+++ b/
build/rails-package-scripts/arvados-api-server.sh
@@
-10,16
+10,18
@@
INSTALL_PATH=/var/www/arvados-api
CONFIG_PATH=/etc/arvados/api
DOC_URL="http://doc.arvados.org/install/install-api-server.html#configure"
CONFIG_PATH=/etc/arvados/api
DOC_URL="http://doc.arvados.org/install/install-api-server.html#configure"
-RAILSPKG_DATABASE_LOAD_TASK=db:s
tructure
:load
+RAILSPKG_DATABASE_LOAD_TASK=db:s
chema
:load
setup_extra_conffiles() {
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 b
undle exec rake config:check 2>&1 | grep git_internal_dir | awk '{ print $2 }
')
+ GIT_INTERNAL_DIR=$($COMMAND_PREFIX b
in/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"