From b92f5438330daafab999bd3e8adc85f741d756c3 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Tue, 19 Sep 2023 12:03:44 +0300 Subject: [PATCH] updated default value for redis ssl config --- application/src/main/resources/thingsboard.yml | 2 +- .../thingsboard/server/cache/TBRedisClusterConfiguration.java | 2 +- .../thingsboard/server/cache/TBRedisSentinelConfiguration.java | 2 +- .../server/cache/TBRedisStandaloneConfiguration.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 432caa4c27..afda163549 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -550,7 +550,7 @@ redis: password: "${REDIS_PASSWORD:}" # ssl config ssl: - enabled: "${TB_REDIS_SSL_ENABLED:true}" + enabled: "${TB_REDIS_SSL_ENABLED:false}" truststoreLocation: "${TB_REDIS_SSL_TRUSTSTORE_LOCATION:}" truststorePassword: "${TB_REDIS_SSL_TRUSTSTORE_PASSWORD:}" # client authentication could be optional and depends on redis server configuration diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java index 63517a98ac..14ffbedced 100644 --- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java +++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java @@ -40,7 +40,7 @@ public class TBRedisClusterConfiguration extends TBRedisCacheConfiguration { @Value("${redis.password:}") private String password; - @Value("${redis.ssl.enabled:}") + @Value("${redis.ssl.enabled:false}") private boolean useSsl; public JedisConnectionFactory loadFactory() { diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java index dbfb3bce73..18aa315b1c 100644 --- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java +++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java @@ -43,7 +43,7 @@ public class TBRedisSentinelConfiguration extends TBRedisCacheConfiguration { @Value("${redis.db:}") private Integer database; - @Value("${redis.ssl.enabled:}") + @Value("${redis.ssl.enabled:false}") private boolean useSsl; @Value("${redis.password:}") diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java index 55065e443f..b3bfda59cb 100644 --- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java +++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java @@ -57,7 +57,7 @@ public class TBRedisStandaloneConfiguration extends TBRedisCacheConfiguration { @Value("${redis.password:}") private String password; - @Value("${redis.ssl.enabled:}") + @Value("${redis.ssl.enabled:false}") private boolean useSsl; public JedisConnectionFactory loadFactory() {