Merge pull request #498 from dot-mike/patch-1

Prioritize REDIS_SENTINEL over REDIS_HOST

Author: crazy-max

rootfs/etc/cont-init.d/05-svc-dispatcher.sh

@@ -94,20 +94,20 @@ fi
 if [ -z "$REDIS_HOST" ] && [ -z "$REDIS_SENTINEL" ]; then
   echo >&2 "ERROR: REDIS_HOST or REDIS_SENTINEL must be defined"
   exit 1
-elif [ -n "$REDIS_HOST" ]; then
-  echo "Setting Redis"
+elif [ -n "$REDIS_SENTINEL" ]; then
+  echo "Setting Redis Sentinel"
   cat >>${LIBRENMS_PATH}/.env <<EOL
-REDIS_HOST=${REDIS_HOST}
+REDIS_SENTINEL=${REDIS_SENTINEL}
+REDIS_SENTINEL_SERVICE=${REDIS_SENTINEL_SERVICE}
 REDIS_SCHEME=${REDIS_SCHEME}
 REDIS_PORT=${REDIS_PORT}
 REDIS_PASSWORD=${REDIS_PASSWORD}
 REDIS_DB=${REDIS_DB}
 EOL
-elif [ -n "$REDIS_SENTINEL" ]; then
-  echo "Setting Redis Sentinel"
+elif [ -n "$REDIS_HOST" ]; then
+  echo "Setting Redis"
   cat >>${LIBRENMS_PATH}/.env <<EOL
-REDIS_SENTINEL=${REDIS_SENTINEL}
-REDIS_SENTINEL_SERVICE=${REDIS_SENTINEL_SERVICE}
+REDIS_HOST=${REDIS_HOST}
 REDIS_SCHEME=${REDIS_SCHEME}
 REDIS_PORT=${REDIS_PORT}
 REDIS_PASSWORD=${REDIS_PASSWORD}