diff --git a/pkg/config/config.go b/pkg/config/config.go index 0d3e91b88..3fc469b4c 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -366,7 +366,7 @@ func InitDefaultConfig() { DatabaseUser.setDefault("vikunja") DatabasePassword.setDefault("") DatabaseDatabase.setDefault("vikunja") - DatabasePath.setDefault("./vikunja.db") + DatabasePath.setDefault(filepath.Join(ServiceRootpath.GetString(), "vikunja.db")) DatabaseMaxOpenConnections.setDefault(100) DatabaseMaxIdleConnections.setDefault(50) DatabaseMaxConnectionLifetime.setDefault(10000) diff --git a/pkg/db/db.go b/pkg/db/db.go index 3dcee36a1..411da8d73 100644 --- a/pkg/db/db.go +++ b/pkg/db/db.go @@ -20,6 +20,7 @@ import ( "fmt" "net/url" "os" + "path/filepath" "strconv" "strings" "time" @@ -178,8 +179,9 @@ func initPostgresEngine() (engine *xorm.Engine, err error) { func initSqliteEngine() (engine *xorm.Engine, err error) { path := config.DatabasePath.GetString() - if path == "" { - path = "./db.db" + + if path != "memory" && !filepath.IsAbs(path) { + path = filepath.Join(config.ServiceRootpath.GetString(), path) } if path == "memory" {