From 2bef1b83e8d3347c4c285c4c411cf92a7e628fdc Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 6 Jul 2018 16:26:12 +0300
Subject: [PATCH] Make token path configurable
---
Dockerfile | 2 +-
gitlab-auth.go | 4 ++--
maulabbot.go | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a78c7dc..a8fad6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ FROM scratch
COPY --from=builder /usr/bin/maulabbot /usr/bin/maulabbot
COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs
-CMD ["/usr/bin/maulabbot"]
+CMD ["/usr/bin/maulabbot", "-c", "/etc/maulabbot/config.json", "-t", "/etc/maulabbot/tokens.json"]
diff --git a/gitlab-auth.go b/gitlab-auth.go
index d3ecfb6..a965d45 100644
--- a/gitlab-auth.go
+++ b/gitlab-auth.go
@@ -28,11 +28,11 @@ var gitlabTokens = make(map[string]string)
func saveGitlabTokens() {
data, _ := json.MarshalIndent(gitlabTokens, "", " ")
- ioutil.WriteFile("tokens.json", data, 0600)
+ ioutil.WriteFile(*tokensPath, data, 0600)
}
func loadGitlabTokens() {
- data, err := ioutil.ReadFile("tokens.json")
+ data, err := ioutil.ReadFile(*tokensPath)
if err != nil {
return
}
diff --git a/maulabbot.go b/maulabbot.go
index b6313c3..4c51d64 100644
--- a/maulabbot.go
+++ b/maulabbot.go
@@ -28,9 +28,10 @@ import (
var wantHelp, _ = flag.MakeHelpFlag()
var configPath = flag.MakeFull("c", "config", "The path to the config file.", "config.json").String()
+var tokensPath = flag.MakeFull("t", "tokens", "The path to the tokens file.", "tokens.json").String()
func main() {
- flag.SetHelpTitles("maulabbot - A GitLab bot for Matrix", "maulabbot [-h] [-c /path/to/config]")
+ flag.SetHelpTitles("maulabbot - A GitLab bot for Matrix", "maulabbot [-h] [-c /path/to/config] [-t /path/to/tokens]")
err := flag.Parse()
if err != nil {
fmt.Println(err)
--
GitLab