From 8a8f8552ab9f32d9ccaa7a6da2b760e56ef56e33 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 1 Sep 2022 10:30:06 +0100
Subject: [PATCH] Sane defaults for SQLite database names

---
 cmd/generate-config/main.go | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/cmd/generate-config/main.go b/cmd/generate-config/main.go
index 3a6e31330..c7f0f658b 100644
--- a/cmd/generate-config/main.go
+++ b/cmd/generate-config/main.go
@@ -36,18 +36,25 @@ func main() {
 	if *serverName != "" {
 		cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
 	}
-	if uri := config.DataSource(*dbURI); uri != "" {
-		if *polylith || uri.IsSQLite() {
-			cfg.FederationAPI.Database.ConnectionString = uri
-			cfg.KeyServer.Database.ConnectionString = uri
-			cfg.MSCs.Database.ConnectionString = uri
-			cfg.MediaAPI.Database.ConnectionString = uri
-			cfg.RoomServer.Database.ConnectionString = uri
-			cfg.SyncAPI.Database.ConnectionString = uri
-			cfg.UserAPI.AccountDatabase.ConnectionString = uri
-		} else {
-			cfg.Global.DatabaseOptions.ConnectionString = uri
+	uri := config.DataSource(*dbURI)
+	if *polylith || uri.IsSQLite() || uri == "" {
+		for name, db := range map[string]*config.DatabaseOptions{
+			"federationapi": &cfg.FederationAPI.Database,
+			"keyserver":     &cfg.KeyServer.Database,
+			"mscs":          &cfg.MSCs.Database,
+			"mediaapi":      &cfg.MediaAPI.Database,
+			"roomserver":    &cfg.RoomServer.Database,
+			"syncapi":       &cfg.SyncAPI.Database,
+			"userapi":       &cfg.UserAPI.AccountDatabase,
+		} {
+			if uri == "" {
+				db.ConnectionString = config.DataSource(fmt.Sprintf("file:dendrite_%s.db", name))
+			} else {
+				db.ConnectionString = uri
+			}
 		}
+	} else {
+		cfg.Global.DatabaseOptions.ConnectionString = uri
 	}
 	cfg.Logging = []config.LogrusHook{
 		{