dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated env variable name and descriptions

Browse Source
This commit is contained in:
dashevchenko 2024-01-22 12:31:01 +02:00
parent 05f0dd4137
commit e27ef320e7
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/resources/thingsboard.yml
View File

@ -642,7 +642,7 @@ redis:
# ssl config
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -651,9 +651,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file (optional)
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file (optional)
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore:

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

@ -89,4 +89,4 @@ public class TBRedisStandaloneConfiguration extends TBRedisCacheConfiguration {
}
return jedisClientConfigurationBuilder.build();
}
}
}

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
View File

@ -108,7 +108,7 @@ public class ContainerTestSuite {
if (IS_REDIS_SSL) {
addToFile(targetDir, "cache-redis.env",
Map.of("REDIS_SSL_ENABLED", "true",
Map.of("TB_REDIS_SSL_ENABLED", "true",
"TB_REDIS_SSL_PEM_CERT", "/redis/certs/redisCA.crt"));
}

6
transport/coap/src/main/resources/tb-coap-transport.yml
View File

@ -96,7 +96,7 @@ redis:
password: "${REDIS_PASSWORD:}"
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -105,9 +105,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore:

6
transport/http/src/main/resources/tb-http-transport.yml
View File

@ -129,7 +129,7 @@ redis:
password: "${REDIS_PASSWORD:}"
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -138,9 +138,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore:

6
transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
View File

@ -96,7 +96,7 @@ redis:
password: "${REDIS_PASSWORD:}"
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -105,9 +105,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore:

6
transport/mqtt/src/main/resources/tb-mqtt-transport.yml
View File

@ -97,7 +97,7 @@ redis:
password: "${REDIS_PASSWORD:}"
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -106,9 +106,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore:

6
transport/snmp/src/main/resources/tb-snmp-transport.yml
View File

@ -96,7 +96,7 @@ redis:
password: "${REDIS_PASSWORD:}"
ssl:
# Enable/disable secure connection
enabled: "${REDIS_SSL_ENABLED:false}"
enabled: "${TB_REDIS_SSL_ENABLED:false}"
# Server SSL credentials
credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@ -105,9 +105,9 @@ redis:
pem:
# Path redis server (CA) certificate
cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
# Path to user certificate file
# Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
# Path to user private key file
# Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
# Keystore server credentials
keystore: