From 922537096781d80d1edf0abf7b0f8f2188c702c3 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Tue, 7 Jun 2022 20:39:11 +0200 Subject: [PATCH] Fix Tailscale --- httpListener.go | 3 ++- tailscale.go | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/httpListener.go b/httpListener.go index bcebd78..6d0eb20 100644 --- a/httpListener.go +++ b/httpListener.go @@ -25,8 +25,9 @@ func (a *goBlog) getTCPListener(s *http.Server) (net.Listener, error) { if err != nil { return nil, err } + tailscaleLC := &tailscale.LocalClient{} return tls.NewListener(ln, &tls.Config{ - GetCertificate: tailscale.GetCertificate, + GetCertificate: tailscaleLC.GetCertificate, MinVersion: tls.VersionTLS12, }), nil } else { diff --git a/tailscale.go b/tailscale.go index ffe98cd..a8672b4 100644 --- a/tailscale.go +++ b/tailscale.go @@ -8,7 +8,6 @@ import ( "os" "path/filepath" - "tailscale.com/client/tailscale" "tailscale.com/tsnet" ) @@ -45,10 +44,14 @@ func (a *goBlog) getTailscaleListener(addr string) (net.Listener, error) { if err != nil { return nil, err } + lc, err := a.tss.LocalClient() + if err != nil { + return nil, err + } // Tailscale HTTPS if addr == ":443" && a.cfg.Server.TailscaleHTTPS { ln = tls.NewListener(ln, &tls.Config{ - GetCertificate: tailscale.GetCertificate, + GetCertificate: lc.GetCertificate, MinVersion: tls.VersionTLS12, }) }