From bdefa29fb2395eec79564145186d9ad1ec45dff3 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Fri, 11 Nov 2022 19:19:25 +0100
Subject: Restrict configuration to config file

This drops also the -d flag and the database/user config option.

The -d flag used to override specific parts of the config file. This is
just confusing behaviour. Instead a new config/debug.json file is
introduced with useful default values.

Instead of configuring the database user via the database/user entry in
the config file, the user is determined from the Linux user of the
server process. This enforces that a database user with the same name as
the Linux user is configured which is already described in the README.
---
 utils/database.go | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'utils/database.go')

diff --git a/utils/database.go b/utils/database.go
index b8a6941..f48af35 100644
--- a/utils/database.go
+++ b/utils/database.go
@@ -31,7 +31,7 @@ func InitDatabase(config DatabaseConfig) Database {
 	db := NewDatabase(config)
 	db.Connect()
 	db.Ping()
-	db.Migrate(config.Debug)
+	db.Migrate(config.Migrations)
 
 	// allow graceful shutdown
 	var listener = make(chan os.Signal)
@@ -53,15 +53,11 @@ func NewDatabase(config DatabaseConfig) Database {
 
 	db.config = config
 	var username string
-	if config.Debug {
-		user_ptr,err := user.Current()
-		if err != nil {
-			log.Fatal(err)
-		}
-		username = user_ptr.Username
-	} else {
-		username = config.User
+	user_ptr,err := user.Current()
+	if err != nil {
+		log.Fatal(err)
 	}
+	username = user_ptr.Username
 	db.target = fmt.Sprintf("%s@unix(%s)/%s", username, config.Socket, config.Database)
 
 	return db
@@ -85,15 +81,7 @@ func (db *Database) Ping() {
 	}
 }
 
-func (db *Database) Migrate(debug bool) {
-
-	// get directory with SQL migration scripts
-	var dir string
-	if debug {
-		dir = "./sql"
-	} else {
-		dir = "/usr/share/ceres/migrations/"
-	}
+func (db *Database) Migrate(dir string) {
 
 	const t = databaseSchemaVersion  // targeted database schema version
 
-- 
cgit v1.2.3-70-g09d2