From 9d5af6c3dc3f502e21f1dcf305cc0306c9bfc9fe Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 24 Jun 2025 12:32:52 +0200 Subject: [PATCH] [bugfix] update the default configuration to not set a db type or address, to require explicitly setting it (#4228) This updates the database defaults to remove a type or address. This is to help ensure we don't have any repeats of https://codeberg.org/superseriousbusiness/gotosocial/issues/4183, it means the user needs to explicitly configure these things core settings instead of relying on defaults. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4228 Reviewed-by: Daenney Co-authored-by: kim Co-committed-by: kim --- docs/configuration/database.md | 4 ++-- example/config.yaml | 2 +- internal/config/defaults.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/configuration/database.md b/docs/configuration/database.md index 223742753..0823d675b 100644 --- a/docs/configuration/database.md +++ b/docs/configuration/database.md @@ -2,7 +2,7 @@ GoToSocial stores statuses, accounts, etc, in a database. This can be either [SQLite](https://sqlite.org/index.html) or [Postgres](https://www.postgresql.org/). -By default, GoToSocial will use SQLite, but this is easy to change. +GoToSocial has no default configured database type or address. In most situations, we recommend the use of SQLite. ## SQLite @@ -71,7 +71,7 @@ db-postgres-connection-string: 'postgres://myUser:myPass@localhost/db?search_pat # String. Database type. # Options: ["postgres","sqlite"] -# Default: "sqlite" +# Default: "" db-type: "sqlite" # String. Database address or parameters. diff --git a/example/config.yaml b/example/config.yaml index 4526fb8fc..64b4f2de2 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -141,7 +141,7 @@ trusted-proxies: # String. Database type. # Options: ["postgres","sqlite"] -# Default: "sqlite" +# Default: "" db-type: "sqlite" # String. Database address or parameters. diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 6506e3e58..234f0f8d0 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -41,8 +41,8 @@ var Defaults = Configuration{ Port: 8080, TrustedProxies: []string{"127.0.0.1/32", "::1"}, // localhost - DbType: "sqlite", - DbAddress: "db.sqlite", + DbType: "", + DbAddress: "", DbPort: 5432, DbUser: "", DbPassword: "",