~edwargix/git.sr.ht: gitsrht-{shell,update-hook}: Support SRHT_CONFIG variable

91f92f2eac236ee34c5f20249e39ca041aa92a7b — Adnan Maolood 2 years ago dbd2a13

gitsrht-{shell,update-hook}: Support SRHT_CONFIG variable

Attempt to load the configuration file from the path specified in the
SRHT_CONFIG environment variable. If that fails, fallback to
/etc/sr.ht/config.ini.

patch browse .tar.gz

2 files changed, 2 insertions(+), 2 deletions(-)

M gitsrht-shell/main.go
M gitsrht-update-hook/main.go

M gitsrht-shell/main.go => gitsrht-shell/main.go +1 -1

@@ 77,7 77,7 @@ func main() {
 	}
 	pusherName = os.Args[2]
 
-	for _, path := range []string{"../config.ini", "/etc/sr.ht/config.ini"} {
+	for _, path := range []string{os.Getenv("SRHT_CONFIG"), "/etc/sr.ht/config.ini"} {
 		config, err = ini.LoadFile(path)
 		if err == nil {
 			break

M gitsrht-update-hook/main.go => gitsrht-update-hook/main.go +1 -1

@@ 47,7 47,7 @@ func init() {
 		logger = log.New(logf, os.Args[0]+" ", log.LstdFlags)
 	}
 
-	for _, path := range []string{"../config.ini", "/etc/sr.ht/config.ini"} {
+	for _, path := range []string{os.Getenv("SRHT_CONFIG"), "/etc/sr.ht/config.ini"} {
 		config, err = ini.LoadFile(path)
 		if err == nil {
 			break