merged master

This commit is contained in:
André Bauer 2017-11-21 16:26:34 +01:00
commit 991cb6aaae

View File

@ -35,9 +35,12 @@ if [ "$1" = 'zammad-railsserver' ]; then
mount_nfs mount_nfs
# db mirgrate # db mirgrate
set +e
bundle exec rake db:migrate &> /dev/null bundle exec rake db:migrate &> /dev/null
DB_CHECK="$?"
set -e
if [ $? != 0 ]; then if [ "${DB_CHECK}" != "0" ]; then
echo "creating db & searchindex..." echo "creating db & searchindex..."
bundle exec rake db:create bundle exec rake db:create
bundle exec rake db:migrate bundle exec rake db:migrate