taldir

commit 7008148eb30d0752f59be4e917f9f9ec32cd723a
parent 9b256400c4f5e3dc582b54ad9ef667ce2e3c351b
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Sat, 14 Feb 2026 22:38:38 +0100

allow to omit password and user for database

Diffstat:
M
cmd/taldir-dbinit/main.go
 | 
22
+++++++++++++++++-----
M
cmd/taldir-server/main.go
 | 
26
++++++++++++++++++++------
M
pkg/taldir/db.go
 | 
4
+---

3 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/cmd/taldir-dbinit/main.go b/cmd/taldir-dbinit/main.go
@@ -102,13 +102,25 @@ func main() {
 			os.Exit(1)
 		}
 	}
+	dbHost := cfg.Section("taldir-pq").Key("host").MustString("localhost")
 	dbName := cfg.Section("taldir-pq").Key("db_name").MustString("taldir")
-	psqlconn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
-		cfg.Section("taldir-pq").Key("host").MustString("localhost"),
-		cfg.Section("taldir-pq").Key("port").MustInt64(5432),
-		cfg.Section("taldir-pq").Key("user").MustString("taldir"),
-		cfg.Section("taldir-pq").Key("password").MustString("secret"),
+	dbPort := cfg.Section("taldir-pq").Key("port").MustInt64(5432)
+	dbUser := cfg.Section("taldir-pq").Key("user").MustString("")
+	dbPassword := cfg.Section("taldir-pq").Key("password").MustString("")
+	psqlconn := fmt.Sprintf("host=%s port=%d dbname=%s sslmode=disable",
+		dbHost,
+		dbPort,
 		dbName)
+	if dbUser != "" {
+		psqlconn = fmt.Sprintf("%s user=%s",
+			psqlconn,
+			dbUser)
+	}
+	if dbPassword != "" {
+		psqlconn = fmt.Sprintf("%s password=%s",
+			psqlconn,
+			dbPassword)
+	}
 
 	db, err := sql.Open("postgres", psqlconn)
 	if err != nil {
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
@@ -95,12 +95,26 @@ func main() {
 		log.Fatalf("Failed to read config: %v", err)
 		os.Exit(1)
 	}
-	psqlconn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
-		cfg.Section("taldir-pq").Key("host").MustString("localhost"),
-		cfg.Section("taldir-pq").Key("port").MustInt64(5432),
-		cfg.Section("taldir-pq").Key("user").MustString("taldir"),
-		cfg.Section("taldir-pq").Key("password").MustString("secret"),
-		cfg.Section("taldir-pq").Key("db_name").MustString("taldir"))
+	dbHost := cfg.Section("taldir-pq").Key("host").MustString("localhost")
+	dbName := cfg.Section("taldir-pq").Key("db_name").MustString("taldir")
+	dbPort := cfg.Section("taldir-pq").Key("port").MustInt64(5432)
+	dbUser := cfg.Section("taldir-pq").Key("user").MustString("")
+	dbPassword := cfg.Section("taldir-pq").Key("password").MustString("")
+	psqlconn := fmt.Sprintf("host=%s port=%d dbname=%s sslmode=disable",
+		dbHost,
+		dbPort,
+		dbName)
+	if dbUser != "" {
+		psqlconn = fmt.Sprintf("%s user=%s",
+			psqlconn,
+			dbUser)
+	}
+	if dbPassword != "" {
+		psqlconn = fmt.Sprintf("%s password=%s",
+			psqlconn,
+			dbPassword)
+	}
+
 
 	db, err := sql.Open("postgres", psqlconn)
 	if err != nil {
diff --git a/pkg/taldir/db.go b/pkg/taldir/db.go
@@ -529,7 +529,7 @@ func RunSQL(db *sql.DB, patchName string, dbName string) error {
 		return err
 	}
 	_, err = exec.Command(path, dbName, "-f", patchName, "-q", "--set", "ON_ERROR_STOP=1").Output()
-	fmt.Printf("Running: %s %s %s %s %s %s %s\n", path,  dbName, "-f", patchName, "-q", "--set", "ON_ERROR_STOP=1")
+	fmt.Printf("Running: %s %s %s %s %s %s %s\n", path, dbName, "-f", patchName, "-q", "--set", "ON_ERROR_STOP=1")
 	if err != nil {
 		return err
 	}
@@ -572,5 +572,3 @@ func DBInit(db *sql.DB, datahome string, dbName string) error {
 	}
 	return nil
 }
-
-