matrix-synapse: Use modern redis auth values
This commit is contained in:
parent
0ac1476b40
commit
ca32982ff9
3 changed files with 5 additions and 3 deletions
|
@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
|
||||||
appVersion: 1.52.0
|
appVersion: 1.52.0
|
||||||
|
|
||||||
type: application
|
type: application
|
||||||
version: 2.1.26
|
version: 2.1.27
|
||||||
maintainers:
|
maintainers:
|
||||||
- name: Alexander Olofsson
|
- name: Alexander Olofsson
|
||||||
email: ace@haxalot.com
|
email: ace@haxalot.com
|
||||||
|
|
|
@ -253,8 +253,10 @@ Set redis port
|
||||||
Set redis password
|
Set redis password
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "matrix-synapse.redis.password" -}}
|
{{- define "matrix-synapse.redis.password" -}}
|
||||||
{{- if .Values.redis.enabled -}}
|
{{- if .Values.redis.password -}}
|
||||||
{{ .Values.redis.password }}
|
{{ .Values.redis.password }}
|
||||||
|
{{- else if .Values.redis.auth.password -}}
|
||||||
|
{{ .Values.redis.auth.password }}
|
||||||
{{- else if .Values.externalRedis.password -}}
|
{{- else if .Values.externalRedis.password -}}
|
||||||
{{ .Values.externalRedis.password }}
|
{{ .Values.externalRedis.password }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -66,7 +66,7 @@ stringData:
|
||||||
redis:
|
redis:
|
||||||
enabled: true
|
enabled: true
|
||||||
host: {{ $redisHost | quote }}
|
host: {{ $redisHost | quote }}
|
||||||
{{- if or .Values.redis.usePassword .Values.redis.password .Values.externalRedis.password }}
|
{{- if or .Values.redis.auth.enabled .Values.redis.usePassword .Values.redis.password .Values.redis.auth.password .Values.externalRedis.password }}
|
||||||
{{- if and $redisPass (not .Values.redis.existingSecret) }}
|
{{- if and $redisPass (not .Values.redis.existingSecret) }}
|
||||||
password: {{ $redisPass | quote }}
|
password: {{ $redisPass | quote }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|
Loading…
Reference in a new issue