This commit is contained in:
Alexey Bannov 2017-05-26 06:46:30 -04:00
parent b2c56f270f
commit a00d64619c
1 changed files with 10 additions and 6 deletions

View File

@ -197,6 +197,16 @@ MAIL_SERVER_DB_NAME=${MAIL_SERVER_DB_NAME:-"onlyoffice_mailserver"};
MAIL_SERVER_DB_USER=${MAIL_SERVER_DB_USER:-"mail_admin"};
MAIL_SERVER_DB_PASS=${MAIL_SERVER_DB_PASS:-"Isadmin123"};
if [ ${MAIL_SERVER_DB_HOST} ]; then
if [ ! bash ${SYSCONF_TOOLS_DIR}/wait-for-it.sh ${MAIL_SERVER_DB_HOST}:25 --timeout=300 --quiet -s -- echo "MailServer is up" ]; then
unset MAIL_SERVER_DB_HOST;
unset MAIL_SERVER_PORT_3306_TCP_ADDR;
MAIL_SERVER_DB_HOST="";
echo "";
fi
fi
if [ ${MAIL_SERVER_DB_HOST} ]; then
MAIL_SERVER_ENABLED=true;
@ -485,12 +495,6 @@ fi
if [ "${MAIL_SERVER_ENABLED}" == "true" ]; then
if [ "${DOCKER_ENABLED}" == "true" ]; then
while ! bash ${SYSCONF_TOOLS_DIR}/wait-for-it.sh ${MAIL_SERVER_DB_HOST}:25 --quiet -s -- echo "MailServer is up"; do
sleep 1
done
fi
timeout=120;
interval=10;