Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-06-05 01:20:21 +02:00
Code Issues Projects Releases Wiki Activity

chore(derp): prioritize loading DERP maps from URLs

Browse Source 
This allows users to override default entries provided via URL
This commit is contained in:
Andrey Bobelev 2025-05-14 15:04:31 +03:00
parent 62b489dc68
commit 6d9ad7fe5d
No known key found for this signature in database
GPG Key ID: 8BC07FB9FEAEEF63
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hscontrol/derp/derp.go
View File

@ -86,25 +86,6 @@ func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
derpMaps = append(derpMaps, cfg.DERPMap) derpMaps = append(derpMaps, cfg.DERPMap)
} }
for _, path := range cfg.Paths {
log.Debug().
Str("func", "GetDERPMap").
Str("path", path).
Msg("Loading DERPMap from path")
derpMap, err := loadDERPMapFromPath(path)
if err != nil {
log.Error().
Str("func", "GetDERPMap").
Str("path", path).
Err(err).
Msg("Could not load DERP map from path")
break
}
derpMaps = append(derpMaps, derpMap)
}
for _, addr := range cfg.URLs { for _, addr := range cfg.URLs {
derpMap, err := loadDERPMapFromURL(addr) derpMap, err := loadDERPMapFromURL(addr)
log.Debug(). log.Debug().
@ -124,6 +105,25 @@ func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
derpMaps = append(derpMaps, derpMap) derpMaps = append(derpMaps, derpMap)
} }
for _, path := range cfg.Paths {
log.Debug().
Str("func", "GetDERPMap").
Str("path", path).
Msg("Loading DERPMap from path")
derpMap, err := loadDERPMapFromPath(path)
if err != nil {
log.Error().
Str("func", "GetDERPMap").
Str("path", path).
Err(err).
Msg("Could not load DERP map from path")
break
}
derpMaps = append(derpMaps, derpMap)
}
derpMap := mergeDERPMaps(derpMaps) derpMap := mergeDERPMaps(derpMaps)
log.Trace().Interface("derpMap", derpMap).Msg("DERPMap loaded") log.Trace().Interface("derpMap", derpMap).Msg("DERPMap loaded")