From c6648db3336bfe10b40e7cf75d3a94ad1326fcc7 Mon Sep 17 00:00:00 2001 From: Maisem Ali Date: Sun, 17 Jul 2022 12:29:04 -0700 Subject: [PATCH] cmd/tailscale/cli: make cert use localClient This was seeminlgy missed in 87ba528ae0c1138e8e8b2b1d91fbe2b97c84d9ae. Fixes #5072 Signed-off-by: Maisem Ali --- cmd/tailscale/cli/cert.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/tailscale/cli/cert.go b/cmd/tailscale/cli/cert.go index dd4b5b4ab..e2a525bda 100644 --- a/cmd/tailscale/cli/cert.go +++ b/cmd/tailscale/cli/cert.go @@ -17,7 +17,6 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" "tailscale.com/atomicfile" - "tailscale.com/client/tailscale" "tailscale.com/ipn" "tailscale.com/version" ) @@ -46,7 +45,7 @@ func runCert(ctx context.Context, args []string) error { if certArgs.serve { s := &http.Server{ TLSConfig: &tls.Config{ - GetCertificate: tailscale.GetCertificate, + GetCertificate: localClient.GetCertificate, }, Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.TLS != nil && !strings.Contains(r.Host, ".") && r.Method == "GET" { @@ -90,7 +89,7 @@ func runCert(ctx context.Context, args []string) error { certArgs.certFile = domain + ".crt" certArgs.keyFile = domain + ".key" } - certPEM, keyPEM, err := tailscale.CertPair(ctx, domain) + certPEM, keyPEM, err := localClient.CertPair(ctx, domain) if err != nil { return err }