From ce35da5a3f83da4ae1b2eb4f93bda8e6fbe30cbe Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:17:02 +0100
Subject: [PATCH] Remove unneeded DBs

---
 helm/dendrite/templates/secrets.yaml | 2 +-
 helm/dendrite/values.yaml            | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/helm/dendrite/templates/secrets.yaml b/helm/dendrite/templates/secrets.yaml
index 071a2fc38..b56ce1ff0 100644
--- a/helm/dendrite/templates/secrets.yaml
+++ b/helm/dendrite/templates/secrets.yaml
@@ -23,7 +23,7 @@ type: Opaque
 
 {{- $connectionString := print "postgresql://" .Values.configuration.database.user ":" .Values.configuration.database.password "@" .Values.configuration.database.host }}
 {{- if .Values.postgresql.enabled }}
-{{- $connectionString = print "postgresql://" .Values.postgresql.auth.username ":" .Values.postgresql.auth.password "@" .Chart.Name -}}
+{{- $connectionString = print "postgresql://" .Values.postgresql.auth.username ":" .Values.postgresql.auth.password "@" .Release.Name "-postgresql/dendrite" -}}
 {{ end }}
 ---
 apiVersion: v1
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index 01b464900..1df8f7186 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -231,15 +231,6 @@ postgresql:
     password: changeme
     database: dendrite
 
-  initdbScripts:
-    # -- Create databases when first creating a PostgreSQL Server
-    # @default -- creates the required databases
-    create_db.sh: |
-      #!/bin/sh
-      for db in userapi_accounts userapi_devices mediaapi syncapi roomserver keyserver federationapi mscs; do
-          createdb -U dendrite -O dendrite dendrite_$db
-      done
-
   persistence:
     enabled: false