ActivityPub-federated video streaming platform using P2P directly in your web browser
Prefer enable_tls for sentinel config consistency
Chocobozzz48cda7c4a98b
diff --git a/config/default.yaml b/config/default.yamlindex 5757a82c2c..a84ed6dec1 100644--- a/config/default.yaml+++ b/config/default.yaml@@ -95,16 +95,17 @@ redis:port: 6379auth: nulldb: 0- tls: false- tls_settings:+ enable_tls: false+ tls_settings:reject_unauthorized: falseca: '/absolute/path/to/server-certificates/root.crt'cert: '/absolute/path/to/client-certificates/postgresql.crt'key: '/absolute/path/to/client-key/postgresql.key'+sentinel:enabled: falseenable_tls: false- tls_settings:+ tls_settings:reject_unauthorized: falseca: '/absolute/path/to/server-certificates/root.crt'cert: '/absolute/path/to/client-certificates/postgresql.crt'diff --git a/config/production.yaml.example b/config/production.yaml.exampleindex 2c3b05b66c..00c11b8829 100644--- a/config/production.yaml.example+++ b/config/production.yaml.example@@ -93,16 +93,17 @@ redis:port: 6379auth: nulldb: 0- tls: false- tls_settings:+ enable_tls: false+ tls_settings:reject_unauthorized: falseca: '/absolute/path/to/server-certificates/root.crt'cert: '/absolute/path/to/client-certificates/postgresql.crt'key: '/absolute/path/to/client-key/postgresql.key'+sentinel:enabled: falseenable_tls: false- tls_settings:+ tls_settings:reject_unauthorized: falseca: '/absolute/path/to/server-certificates/root.crt'cert: '/absolute/path/to/client-certificates/postgresql.crt'diff --git a/server/core/initializers/config.ts b/server/core/initializers/config.tsindex f75b3c7823..6c9ec1d212 100644--- a/server/core/initializers/config.ts+++ b/server/core/initializers/config.ts@@ -51,20 +51,20 @@ const CONFIG = {SOCKET: config.has('redis.socket') ? config.get<string>('redis.socket') : null,AUTH: config.has('redis.auth') ? config.get<string>('redis.auth') : null,DB: config.has('redis.db') ? config.get<number>('redis.db') : null,- TLS: config.has('redis.tls') ? config.get<boolean>('redis.tls') : false,+ TLS: config.has('redis.enable_tls') ? config.get<boolean>('redis.enable_tls') : false,TLS_SETTINGS: {get REJECT_UNAUTHORIZED () {- return config.has('redis.tls_settings.reject_unauthorized')- ? config.get<boolean>('redis.tls_settings.reject_unauthorized')+ return config.has('redis.tls_settings.reject_unauthorized')+ ? config.get<boolean>('redis.tls_settings.reject_unauthorized'): false},- get CA() {+ get CA () {return config.has('redis.tls_settings.ca') ? config.get<string>('redis.tls_settings.ca') : null},- get CERT() {+ get CERT () {return config.has('redis.tls_settings.cert') ? config.get<string>('redis.tls_settings.cert') : null},- get KEY() {+ get KEY () {return config.has('redis.tls_settings.key') ? config.get<string>('redis.tls_settings.key') : null}},@@ -73,17 +73,17 @@ const CONFIG = {ENABLE_TLS: config.has('redis.sentinel.enable_tls') ? config.get<boolean>('redis.sentinel.enable_tls') : false,TLS_SETTINGS: {get REJECT_UNAUTHORIZED () {- return config.has('redis.sentinel.tls_settings.reject_unauthorized')- ? config.get<boolean>('redis.sentinel.tls_settings.reject_unauthorized')+ return config.has('redis.sentinel.tls_settings.reject_unauthorized')+ ? config.get<boolean>('redis.sentinel.tls_settings.reject_unauthorized'): false},- get CA() {+ get CA () {return config.has('redis.sentinel.tls_settings.ca') ? config.get<string>('redis.sentinel.tls_settings.ca') : null},- get CERT() {+ get CERT () {return config.has('redis.sentinel.tls_settings.cert') ? config.get<string>('redis.sentinel.tls_settings.cert') : null},- get KEY() {+ get KEY () {return config.has('redis.sentinel.tls_settings.key') ? config.get<string>('redis.sentinel.tls_settings.key') : null}},