From aa29fd95a381af330543796f4253df9466abee38 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Wed, 21 Jan 2026 16:50:28 +0000 Subject: [PATCH] derp: migrate to derpserver package API tailscale.com v1.94.0 moved derp.Server to the derpserver subpackage. Update imports and type references accordingly. --- hscontrol/derp/server/derp_server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hscontrol/derp/server/derp_server.go b/hscontrol/derp/server/derp_server.go index c736da28..474306e5 100644 --- a/hscontrol/derp/server/derp_server.go +++ b/hscontrol/derp/server/derp_server.go @@ -20,6 +20,7 @@ import ( "github.com/juanfont/headscale/hscontrol/util" "github.com/rs/zerolog/log" "tailscale.com/derp" + "tailscale.com/derp/derpserver" "tailscale.com/envknob" "tailscale.com/net/stun" "tailscale.com/net/wsconn" @@ -45,7 +46,7 @@ type DERPServer struct { serverURL string key key.NodePrivate cfg *types.DERPConfig - tailscaleDERP *derp.Server + tailscaleDERP *derpserver.Server } func NewDERPServer( @@ -54,7 +55,7 @@ func NewDERPServer( cfg *types.DERPConfig, ) (*DERPServer, error) { log.Trace().Caller().Msg("Creating new embedded DERP server") - server := derp.NewServer(derpKey, util.TSLogfWrapper()) // nolint // zerolinter complains + server := derpserver.New(derpKey, util.TSLogfWrapper()) // nolint // zerolinter complains if cfg.ServerVerifyClients { server.SetVerifyClientURL(DerpVerifyScheme + "://verify")