projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "docker port" usage.
[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 82bc9898aa87c350b38774db6db349294330bc9f..027383ab4f62294aa9661b5e9ce1651457f3bf1a 100644
(file)
--- a/
build/rails-package-scripts/arvados-api-server.sh
+++ b/
build/rails-package-scripts/arvados-api-server.sh
@@
-12,7
+12,9
@@
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() {
}
setup_before_nginx_restart() {