Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-09-25 17:51:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge c86e046a3b into bd35fcf338

Browse Source
This commit is contained in:
liuxocakn 2025-09-18 13:52:33 +00:00 committed by GitHub
commit 207863c835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hscontrol/derp/derp.go
View File

@ -17,7 +17,6 @@ import (
"github.com/juanfont/headscale/hscontrol/types" "github.com/juanfont/headscale/hscontrol/types"
"github.com/spf13/viper" "github.com/spf13/viper"
"gopkg.in/yaml.v3"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
) )
@ -32,7 +31,7 @@ func loadDERPMapFromPath(path string) (*tailcfg.DERPMap, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = yaml.Unmarshal(b, &derpMap) err = json.Unmarshal(b, &derpMap)
return &derpMap, err return &derpMap, err
} }