forked from tangled.org/core
Monorepo for Tangled

keyfetch: make git dir configurable

authored by anirudh.fi and committed by oppi.li 688619ea 906cd0f2

Changed files
+5 -4
cmd
keyfetch
+3 -3
cmd/keyfetch/format.go
··· 4 4 "fmt" 5 5 ) 6 6 7 - func formatKeyData(repoguardPath string, data []map[string]interface{}) string { 7 + func formatKeyData(repoguardPath string, gitDir string, data []map[string]interface{}) string { 8 8 var result string 9 9 for _, entry := range data { 10 10 result += fmt.Sprintf( 11 - `command="%s -base-dir /home/git -user %s -log-path /home/git/log ",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n", 12 - repoguardPath, entry["did"], entry["key"]) 11 + `command="%s -base-dir %s -user %s -log-path /home/git/log ",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n", 12 + repoguardPath, gitDir, entry["did"], entry["key"]) 13 13 } 14 14 return result 15 15 }
+2 -1
cmd/keyfetch/main.go
··· 21 21 func main() { 22 22 endpoint := flag.String("internal-api", "http://localhost:5444", "Internal API endpoint") 23 23 repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary") 24 + gitDir := flag.String("git-dir", "/home/git", "Path to the git directory") 24 25 flag.Parse() 25 26 26 27 resp, err := http.Get(*endpoint + "/keys") ··· 40 41 log.Fatalf("error unmarshalling response body: %v", err) 41 42 } 42 43 43 - fmt.Print(formatKeyData(*repoguardPath, data)) 44 + fmt.Print(formatKeyData(*repoguardPath, *gitDir, data)) 44 45 }