Fix Tailscale

This commit is contained in:
Jan-Lukas Else 2022-06-07 20:39:11 +02:00
parent eb87b9e3a1
commit 9225370967
2 changed files with 7 additions and 3 deletions

View File

@ -25,8 +25,9 @@ func (a *goBlog) getTCPListener(s *http.Server) (net.Listener, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
tailscaleLC := &tailscale.LocalClient{}
return tls.NewListener(ln, &tls.Config{ return tls.NewListener(ln, &tls.Config{
GetCertificate: tailscale.GetCertificate, GetCertificate: tailscaleLC.GetCertificate,
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
}), nil }), nil
} else { } else {

View File

@ -8,7 +8,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"tailscale.com/client/tailscale"
"tailscale.com/tsnet" "tailscale.com/tsnet"
) )
@ -45,10 +44,14 @@ func (a *goBlog) getTailscaleListener(addr string) (net.Listener, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
lc, err := a.tss.LocalClient()
if err != nil {
return nil, err
}
// Tailscale HTTPS // Tailscale HTTPS
if addr == ":443" && a.cfg.Server.TailscaleHTTPS { if addr == ":443" && a.cfg.Server.TailscaleHTTPS {
ln = tls.NewListener(ln, &tls.Config{ ln = tls.NewListener(ln, &tls.Config{
GetCertificate: tailscale.GetCertificate, GetCertificate: lc.GetCertificate,
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
}) })
} }