matrix-synapse: Use modern redis auth values

This commit is contained in:
Alexander Olofsson 2022-02-19 22:05:17 +01:00
parent 0ac1476b40
commit ca32982ff9
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 5 additions and 3 deletions

View file

@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
appVersion: 1.52.0
type: application
version: 2.1.26
version: 2.1.27
maintainers:
- name: Alexander Olofsson
email: ace@haxalot.com

View file

@ -253,8 +253,10 @@ Set redis port
Set redis password
*/}}
{{- define "matrix-synapse.redis.password" -}}
{{- if .Values.redis.enabled -}}
{{- if .Values.redis.password -}}
{{ .Values.redis.password }}
{{- else if .Values.redis.auth.password -}}
{{ .Values.redis.auth.password }}
{{- else if .Values.externalRedis.password -}}
{{ .Values.externalRedis.password }}
{{- end -}}

View file

@ -66,7 +66,7 @@ stringData:
redis:
enabled: true
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) }}
password: {{ $redisPass | quote }}
{{- else }}