From ed1fe25d805efdfb5c76fa3fb406785b513f483e Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sat, 20 Mar 2021 19:07:12 +0100
Subject: [PATCH] matrix-synapse: Check for redis/postgres password

---
 charts/matrix-synapse/templates/deployment.yaml | 6 ++++++
 charts/matrix-synapse/values.yaml               | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/charts/matrix-synapse/templates/deployment.yaml b/charts/matrix-synapse/templates/deployment.yaml
index 4cab56c..32d06f8 100644
--- a/charts/matrix-synapse/templates/deployment.yaml
+++ b/charts/matrix-synapse/templates/deployment.yaml
@@ -1,4 +1,10 @@
 {{- $needsVolumePermissions := and .Values.volumePermissions.enabled (or .Values.persistence.enabled .Values.persistence.existingClaim) }}
+{{- if (and .Values.postgresql.enabled (not .Values.postgresql.postgresqlPassword)) -}}
+{{-  fail "You must specify a static postgres password if using the included postgres chart" -}}
+{{- end -}}
+{{- if (and .Values.redis.enabled (and .Values.redis.usePassword (not .Values.redis.password))) -}}
+{{-  fail "You must specify a static redis password if using the included redis chart" -}}
+{{- end -}}
 ---
 # Server: {{ required "A valid serverName is required" .Values.serverName }}
 apiVersion: apps/v1
diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml
index bdbf5b7..99bd8a6 100644
--- a/charts/matrix-synapse/values.yaml
+++ b/charts/matrix-synapse/values.yaml
@@ -485,6 +485,9 @@ wellknown:
 postgresql:
   enabled: true
 
+  # XXX Change me!
+  postgresqlPassword: synapse
+
   postgresqlUsername: synapse
   postgresqlDatabase: synapse
 
@@ -511,8 +514,10 @@ externalPostgresql:
 redis:
   enabled: true
 
-  # usePassword: false
-  # password: synapse
+  # XXX Change me!
+  usePassword: true
+  password: synapse
+
   cluster:
     enabled: false
   master: