taler-mailbox

commit 4745ddba6bca552184c15bd3d25f1f18a9449816
parent e0af7f32a0fbc52d9dcaba98c81890b1a969600c
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri, 19 Sep 2025 16:54:15 +0200

use sysconfdir for config

Diffstat:
M
Makefile.in
 | 
3
++-
M
cmd/mailbox-server/main.go
 | 
8
+++++++-

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -1,11 +1,12 @@
 all: server
 
 TALER_MAILBOX_HOME=${datadir}/taler-mailbox
+TALER_MAILBOX_CONFDIR=${sysconfdir}/taler-mailbox
 LT_VERSION="1:0:0"
 GITVER=`git describe --tags | sed 's/v//'`
 
 server:
-	${GO} build -ldflags "-X main.ltversion=${LT_VERSION} -X main.version=${VERSION} -X main.mailboxdatahome=${TALER_MAILBOX_HOME}" -o taler-mailbox ./cmd/mailbox-server
+	${GO} build -ldflags "-X main.ltversion=${LT_VERSION} -X main.version=${VERSION} -X main.mailboxdatahome=${TALER_MAILBOX_HOME} -X main.mailboxconfdir=${TALER_MAILBOX_CONFDIR}" -o taler-mailbox ./cmd/mailbox-server
 
 #cli:
 #	go build ./cmd/mailbox-cli
diff --git a/cmd/mailbox-server/main.go b/cmd/mailbox-server/main.go
@@ -26,6 +26,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path"
 
 	"github.com/schanzen/taler-go/pkg/merchant"
 	"rsc.io/getopt"
@@ -37,6 +38,7 @@ var (
 	ltversion       string
 	version         string
 	mailboxdatahome string
+	mailboxconfdir string
 	verbose         bool
 )
 
@@ -68,6 +70,10 @@ func main() {
 		printHelp()
 		return
 	}
+	cfgfile := path.Join(mailboxconfdir, "mailbox.conf")
+	if len(*cfgFlag) != 0 {
+		cfgfile = *cfgFlag
+	}
 	verbose = *verboseFlag
 	loglevel := mailbox.LogInfo
 	for loglevelNum, loglevelString := range mailbox.LoglevelStringMap {
@@ -76,7 +82,7 @@ func main() {
 		}
 	}
 	m := mailbox.Mailbox{}
-	iniCfg, err := ini.Load(*cfgFlag)
+	iniCfg, err := ini.Load(cfgfile)
 	if err != nil {
 		log.Printf("Failed to read config: %v", err)
 		os.Exit(1)