diff --git a/Dockerfile b/Dockerfile index a78c7dc3feb59d6053410b5533d7d5ea10ce0e15..a8fad6de0a2439474b155ea4925d23df4d931b28 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 d3ecfb6cae574dd0f5de7f5542b3b6ae00ca1c7c..a965d45bb026e2030be7e9b9957d2f95c10323af 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 b6313c3ef05ce010c53e5d65c18389b6de2e2160..4c51d64da8db70466a99ea33ef91a9ffa6d10fab 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)