From b8fdc7b187657158884c01eb149b39e2873bab41 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Wed, 1 Mar 2023 18:54:15 +0100
Subject: [PATCH] matrix-synapse: Fix redis password selection

Should now only use internal redis password when the internal redis is
enabled.

Fixes #34
---
 charts/matrix-synapse/templates/_helpers.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/matrix-synapse/templates/_helpers.tpl b/charts/matrix-synapse/templates/_helpers.tpl
index 57290e5..52a2c66 100644
--- a/charts/matrix-synapse/templates/_helpers.tpl
+++ b/charts/matrix-synapse/templates/_helpers.tpl
@@ -262,9 +262,9 @@ Set redis port
 Set redis password
 */}}
 {{- define "matrix-synapse.redis.password" -}}
-{{- if .Values.redis.password -}}
+{{- if (and .Values.redis.enabled .Values.redis.password) -}}
 {{ .Values.redis.password }}
-{{- else if .Values.redis.auth.password -}}
+{{- else if (and .Values.redis.enabled .Values.redis.auth.password) -}}
 {{ .Values.redis.auth.password }}
 {{- else if .Values.externalRedis.password -}}
 {{ .Values.externalRedis.password }}