taldir

commit 6de38ffd56734f9877f8f1ea090210b644cf2783
parent 2e91fbfc877e741bc83d378255059a6bb8974fce
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri, 19 Sep 2025 16:47:40 +0200

use sysconfdir for config

Diffstat:
M
Makefile.in
 | 
7
++++---
M
cmd/taldir-config/main.go
 | 
4
+++-
M
cmd/taldir-server/main.go
 | 
4
+++-

3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -2,14 +2,15 @@ all: server tools
 
 SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' ./cmd/taldir-server))
 TALER_DIRECTORY_HOME=${datadir}/taler-directory
+TALER_DIRECTORY_CONFDIR=${sysconfdir}/taldir
 GITVER=`git describe --tags | sed 's/v//'`
 
 server:
-	${GO} build -o taler-directory -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME}"  ./cmd/taldir-server
+	${GO} build -o taler-directory -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME} -X main.taldirconfdir=${TALER_DIRECTORY_CONFDIR}" ./cmd/taldir-server
 
 tools:
-	${GO} build -o taler-directory-cli -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME}" ./cmd/taldir-cli
-	${GO} build -o taler-directory-config -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME}" ./cmd/taldir-config
+	${GO} build -o taler-directory-cli -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME} -X main.taldirconfdir=${TALER_DIRECTORY_CONFDIR}" ./cmd/taldir-cli
+	${GO} build -o taler-directory-config -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME} -X main.taldirconfdir=${TALER_DIRECTORY_CONFDIR}" ./cmd/taldir-config
 
 
 install: server tools
diff --git a/cmd/taldir-config/main.go b/cmd/taldir-config/main.go
@@ -22,6 +22,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"path"
 
 	"rsc.io/getopt"
 
@@ -31,6 +32,7 @@ import (
 var (
 	version        string
 	taldirdatahome string
+	taldirconfdir  string
 	verbose        bool // FIXME do something with this?
 )
 
@@ -92,7 +94,7 @@ func main() {
 		printHelp()
 		return
 	}
-	cfgfile := "taldir.conf"
+	cfgfile := path.Join(taldirconfdir, "taldir.conf")
 	if len(*cfgFlag) != 0 {
 		cfg, err = ini.Load(*cfgFlag)
 		if err != nil {
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
@@ -32,6 +32,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path"
 
 	"github.com/schanzen/taler-go/pkg/merchant"
 	"gopkg.in/ini.v1"
@@ -44,6 +45,7 @@ var (
 	t              taldir.Taldir
 	version        string
 	taldirdatahome string
+	taldirconfdir  string
 	verbose        bool // FIXME do something with this?
 )
 
@@ -71,7 +73,7 @@ func main() {
 	getopt.Alias("h", "help")
 
 	getopt.Parse()
-	cfgfile := "taldir.conf"
+	cfgfile := path.Join(taldirconfdir, "taldir.conf")
 	if len(*cfgFlag) != 0 {
 		cfgfile = *cfgFlag
 	}