diff --git a/.gitignore b/.gitignore index 723ef36..1f1025f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +.DS_Store \ No newline at end of file diff --git a/entrypoint-sentinel.sh b/entrypoint-sentinel.sh index 88f8c00..7e9609a 100755 --- a/entrypoint-sentinel.sh +++ b/entrypoint-sentinel.sh @@ -13,6 +13,8 @@ EXTERNAL_CONFIG_FILE=${EXTERNAL_CONFIG_FILE:-"/etc/redis/external.conf.d/redis-s DOWN_AFTER_MILLISECONDS=${DOWN_AFTER_MILLISECONDS:-30000} PARALLEL_SYNCS=${PARALLEL_SYNCS:-1} FAILOVER_TIMEOUT=${FAILOVER_TIMEOUT:-180000} +RESOLVE_HOSTNAMES=${RESOLVE_HOSTNAMES:-no} +ANNOUNCE_HOSTNAMES=${ANNOUNCE_HOSTNAMES:-no} sentinel_mode_setup(){ @@ -21,6 +23,8 @@ sentinel_mode_setup(){ echo "sentinel down-after-milliseconds ${MASTER_GROUP_NAME} ${DOWN_AFTER_MILLISECONDS}" echo "sentinel parallel-syncs ${MASTER_GROUP_NAME} ${PARALLEL_SYNCS}" echo "sentinel failover-timeout ${MASTER_GROUP_NAME} ${FAILOVER_TIMEOUT}" + echo "SENTINEL resolve-hostnames ${RESOLVE_HOSTNAMES}" + echo "SENTINEL announce-hostnames ${ANNOUNCE_HOSTNAMES}" if [[ -n "${MASTER_PASSWORD}" ]];then echo "sentinel auth-pass ${MASTER_GROUP_NAME} ${MASTER_PASSWORD}" fi diff --git a/sentinel.conf b/sentinel.conf index 03d6a81..31fa6c4 100644 --- a/sentinel.conf +++ b/sentinel.conf @@ -10,6 +10,6 @@ acllog-max-len 128 # sentinel parallel-syncs mymaster 1 # sentinel failover-timeout mymaster 180000 sentinel deny-scripts-reconfig yes -SENTINEL resolve-hostnames no -SENTINEL announce-hostnames no +# SENTINEL resolve-hostnames no +# SENTINEL announce-hostnames no # SENTINEL master-reboot-down-after-period mymaster 0