projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15781-multi-value-property-search'
[arvados.git]
/
build
/
rails-package-scripts
/
postinst.sh
diff --git
a/build/rails-package-scripts/postinst.sh
b/build/rails-package-scripts/postinst.sh
index 56d55d3276472c43d0fcbd268fefe76b7fb7e6de..7ea21848b2cf5d4a047e9e5e7d0131584954552c 100644
(file)
--- a/
build/rails-package-scripts/postinst.sh
+++ b/
build/rails-package-scripts/postinst.sh
@@
-186,10
+186,6
@@
configure_version() {
setup_confdirs /etc/arvados "$CONFIG_PATH"
setup_conffile environments/production.rb environments/production.rb.example \
|| true
setup_confdirs /etc/arvados "$CONFIG_PATH"
setup_conffile environments/production.rb environments/production.rb.example \
|| true
- setup_conffile application.yml application.yml.example || APPLICATION_READY=0
- if [ -n "$RAILSPKG_DATABASE_LOAD_TASK" ]; then
- setup_conffile database.yml database.yml.example || DATABASE_READY=0
- fi
setup_extra_conffiles
echo "... done."
setup_extra_conffiles
echo "... done."
@@
-203,7
+199,7
@@
configure_version() {
export RAILS_ENV=production
if ! $COMMAND_PREFIX bundle --version >/dev/null; then
export RAILS_ENV=production
if ! $COMMAND_PREFIX bundle --version >/dev/null; then
- run_and_report "Installing bundle
" $COMMAND_PREFIX gem install bundle
+ run_and_report "Installing bundle
r" $COMMAND_PREFIX gem install bundler --version 1.17.3
fi
run_and_report "Running bundle install" \
fi
run_and_report "Running bundle install" \
@@
-229,7
+225,7
@@
configure_version() {
fi
if [ 11 = "$RAILSPKG_SUPPORTS_CONFIG_CHECK$APPLICATION_READY" ]; then
fi
if [ 11 = "$RAILSPKG_SUPPORTS_CONFIG_CHECK$APPLICATION_READY" ]; then
- run_and_report "Checking
application.yml
for completeness" \
+ run_and_report "Checking
configuration
for completeness" \
$COMMAND_PREFIX bundle exec rake config:check || APPLICATION_READY=0
fi
$COMMAND_PREFIX bundle exec rake config:check || APPLICATION_READY=0
fi
@@
-258,9
+254,9
@@
elif [ "$1" = "0" ] || [ "$1" = "1" ] || [ "$1" = "2" ]; then
configure_version
fi
configure_version
fi
-report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml"
if printf '%s\n' "$CONFIG_PATH" | grep -Fqe "sso"; then
report_not_ready "$APPLICATION_READY" "$CONFIG_PATH/application.yml"
if printf '%s\n' "$CONFIG_PATH" | grep -Fqe "sso"; then
report_not_ready "$APPLICATION_READY" "$CONFIG_PATH/application.yml"
+ report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml"
else
report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml"
fi
else
report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml"
fi