conf: overhaul database settings

2 files changed, 34 insertions, 0 deletions

diff --git a/internal/conf/conf.go b/internal/conf/conf.go
index 63df2c8e..0850962e 100644
--- a/internal/conf/conf.go
+++ b/internal/conf/conf.go
@@ -182,6 +182,15 @@ func Init(customConf string) error {
 	Repository.Root = ensureAbs(Repository.Root)
 	Repository.Upload.TempPath = ensureAbs(Repository.Upload.TempPath)
 
+	// *******************************
+	// ----- Database settings -----
+	// *******************************
+
+	if err = File.Section("database").MapTo(&Database); err != nil {
+		return errors.Wrap(err, "mapping [database] section")
+	}
+	Database.Path = ensureAbs(Database.Path)
+
 	handleDeprecated()
 
 	// TODO
diff --git a/internal/conf/static.go b/internal/conf/static.go
index c9fff1dc..80857f3a 100644
--- a/internal/conf/static.go
+++ b/internal/conf/static.go
@@ -123,6 +123,22 @@ var (
 			MaxFiles     int
 		} `ini:"repository.upload"`
 	}
+
+	// Database settings
+	Database struct {
+		Type     string
+		Host     string
+		Name     string
+		User     string
+		Password string
+		SSLMode  string `ini:"SSL_MODE"`
+		Path     string
+
+		// Deprecated: Use Type instead, will be removed in 0.13.
+		DbType string
+		// Deprecated: Use Password instead, will be removed in 0.13.
+		Passwd string
+	}
 )
 
 // handleDeprecated transfers deprecated values to the new ones when set.
@@ -140,4 +156,13 @@ func handleDeprecated() {
 		Server.LandingURL = "/explore"
 		Server.LangdingPage = ""
 	}
+
+	if Database.DbType != "" {
+		Database.Type = Database.DbType
+		Database.DbType = ""
+	}
+	if Database.Passwd != "" {
+		Database.Password = Database.Passwd
+		Database.Passwd = ""
+	}
 }