summaryrefslogtreecommitdiff
path: root/internal/db
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@klarrio.com>2021-03-04 12:08:17 +0100
committerLibravatar tsmethurst <tobi.smethurst@klarrio.com>2021-03-04 12:08:17 +0100
commitbaa2cbcca311ac783b43c94916641bdc391305a8 (patch)
tree1d49c190e93910cbdba9d26341dd62c4d73f21d2 /internal/db
parentMove some consts around (diff)
parentfurther fun (diff)
downloadgotosocial-baa2cbcca311ac783b43c94916641bdc391305a8.tar.xz
Merge branch 'main' of github.com:gotosocial/server into main
Diffstat (limited to 'internal/db')
-rw-r--r--internal/db/service.go15
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/db/service.go b/internal/db/service.go
index 6c738606e..4449a984f 100644
--- a/internal/db/service.go
+++ b/internal/db/service.go
@@ -46,14 +46,13 @@ type Service interface {
// Config provides configuration options for the database connection
type Config struct {
- Type string `json:"type,omitempty"`
- Address string `json:"address,omitempty"`
- Port int `json:"port,omitempty"`
- User string `json:"user,omitempty"`
- Password string `json:"password,omitempty"`
- PasswordFile string `json:"passwordFile,omitempty"`
- Database string `json:"database,omitempty"`
- ApplicationName string `json:"applicationName,omitempty"`
+ Type string `yaml:"type,omitempty"`
+ Address string `yaml:"address,omitempty"`
+ Port int `yaml:"port,omitempty"`
+ User string `yaml:"user,omitempty"`
+ Password string `yaml:"password,omitempty"`
+ Database string `yaml:"database,omitempty"`
+ ApplicationName string `yaml:"applicationName,omitempty"`
}
// NewService returns a new database service that satisfies the Service interface and, by extension,