Browse Source

updated default value for redis ssl config

pull/9225/head
dashevchenko 3 years ago
parent
commit
b92f543833
  1. 2
      application/src/main/resources/thingsboard.yml
  2. 2
      common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java
  3. 2
      common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java
  4. 2
      common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java

2
application/src/main/resources/thingsboard.yml

@ -550,7 +550,7 @@ redis:
password: "${REDIS_PASSWORD:}" password: "${REDIS_PASSWORD:}"
# ssl config # ssl config
ssl: ssl:
enabled: "${TB_REDIS_SSL_ENABLED:true}" enabled: "${TB_REDIS_SSL_ENABLED:false}"
truststoreLocation: "${TB_REDIS_SSL_TRUSTSTORE_LOCATION:}" truststoreLocation: "${TB_REDIS_SSL_TRUSTSTORE_LOCATION:}"
truststorePassword: "${TB_REDIS_SSL_TRUSTSTORE_PASSWORD:}" truststorePassword: "${TB_REDIS_SSL_TRUSTSTORE_PASSWORD:}"
# client authentication could be optional and depends on redis server configuration # client authentication could be optional and depends on redis server configuration

2
common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java

@ -40,7 +40,7 @@ public class TBRedisClusterConfiguration extends TBRedisCacheConfiguration {
@Value("${redis.password:}") @Value("${redis.password:}")
private String password; private String password;
@Value("${redis.ssl.enabled:}") @Value("${redis.ssl.enabled:false}")
private boolean useSsl; private boolean useSsl;
public JedisConnectionFactory loadFactory() { public JedisConnectionFactory loadFactory() {

2
common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java

@ -43,7 +43,7 @@ public class TBRedisSentinelConfiguration extends TBRedisCacheConfiguration {
@Value("${redis.db:}") @Value("${redis.db:}")
private Integer database; private Integer database;
@Value("${redis.ssl.enabled:}") @Value("${redis.ssl.enabled:false}")
private boolean useSsl; private boolean useSsl;
@Value("${redis.password:}") @Value("${redis.password:}")

2
common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java

@ -57,7 +57,7 @@ public class TBRedisStandaloneConfiguration extends TBRedisCacheConfiguration {
@Value("${redis.password:}") @Value("${redis.password:}")
private String password; private String password;
@Value("${redis.ssl.enabled:}") @Value("${redis.ssl.enabled:false}")
private boolean useSsl; private boolean useSsl;
public JedisConnectionFactory loadFactory() { public JedisConnectionFactory loadFactory() {

Loading…
Cancel
Save