Merge branch hotfix/v5.6.1 into develop

This commit is contained in:
papacarlo 2020-08-05 09:39:26 +00:00
commit c5d15c3be7

View file

@ -465,15 +465,17 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
rm -rf /var/run/rabbitmq rm -rf /var/run/rabbitmq
fi fi
if [ ${REDIS_ENABLED} = "true" ]; then
if [ ${REDIS_SERVER_HOST} != "localhost" ]; then if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
update_redis_settings update_redis_settings
elif [ ${REDIS_ENABLED} = "true" ]; then else
# change rights for redis directory # change rights for redis directory
chown -R redis:redis ${REDIS_DATA} chown -R redis:redis ${REDIS_DATA}
chmod -R 750 ${REDIS_DATA} chmod -R 750 ${REDIS_DATA}
LOCAL_SERVICES+=("redis-server") LOCAL_SERVICES+=("redis-server")
fi fi
fi
else else
# no need to update settings just wait for remote data # no need to update settings just wait for remote data
waiting_for_datacontainer waiting_for_datacontainer