From d903d0ddc0db3a6797552145a5aca4f4bed7e43e Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 23 Jun 2022 12:39:50 +0300
Subject: [PATCH] default Redis cluster password changed, set REDISCLI_AUTH to
 simplify redis-cli usage with docker exec

---
 docker/cache-redis-cluster.env          |  2 +-
 docker/docker-compose.redis-cluster.yml | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker/cache-redis-cluster.env b/docker/cache-redis-cluster.env
index 64058ab556..a3b516063b 100644
--- a/docker/cache-redis-cluster.env
+++ b/docker/cache-redis-cluster.env
@@ -2,4 +2,4 @@ CACHE_TYPE=redis
 REDIS_CONNECTION_TYPE=cluster
 REDIS_NODES=redis-node-0:6379,redis-node-1:6379,redis-node-2:6379,redis-node-3:6379,redis-node-4:6379,redis-node-5:6379
 REDIS_USE_DEFAULT_POOL_CONFIG=false
-REDIS_PASSWORD=bitnami
+REDIS_PASSWORD=thingsboard
diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index 17ca4ed13a..0a11b765e8 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -23,7 +23,8 @@ services:
     volumes:
       - ./tb-node/redis-cluster-data-0:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
+      - 'REDISCLI_AUTH=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-1:
@@ -31,7 +32,8 @@ services:
     volumes:
       - ./tb-node/redis-cluster-data-1:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
+      - 'REDISCLI_AUTH=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-2:
@@ -39,7 +41,8 @@ services:
     volumes:
       - ./tb-node/redis-cluster-data-2:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
+      - 'REDISCLI_AUTH=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-3:
@@ -47,7 +50,8 @@ services:
     volumes:
       - ./tb-node/redis-cluster-data-3:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
+      - 'REDISCLI_AUTH=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-4:
@@ -55,7 +59,7 @@ services:
     volumes:
       - ./tb-node/redis-cluster-data-4:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-5:
@@ -69,9 +73,9 @@ services:
       - redis-node-3
       - redis-node-4
     environment:
-      - 'REDIS_PASSWORD=bitnami'
+      - 'REDIS_PASSWORD=thingsboard'
+      - 'REDISCLI_AUTH=thingsboard'
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
-      - 'REDISCLI_AUTH=bitnami'
       - 'REDIS_CLUSTER_REPLICAS=1'
       - 'REDIS_CLUSTER_CREATOR=yes'