chore(derp): prioritize loading DERP maps from URLs

This allows users to override default entries provided via URL
This commit is contained in:
Andrey Bobelev authored and nblock committed 2025-08-23 06:54:14 +02:00
1 parent e949859d33
commit 630bfd265a
1 file changed
+4 -4
+4 -4
View File
@@ -91,8 +91,8 @@ func GetDERPMap(cfg types.DERPConfig) (*tailcfg.DERPMap, error) {
derpMaps = append(derpMaps, cfg.DERPMap)
}
for _, path := range cfg.Paths {
derpMap, err := loadDERPMapFromPath(path)
for _, addr := range cfg.URLs {
derpMap, err := loadDERPMapFromURL(addr)
if err != nil {
return nil, err
}
@@ -100,8 +100,8 @@ func GetDERPMap(cfg types.DERPConfig) (*tailcfg.DERPMap, error) {
derpMaps = append(derpMaps, derpMap)
}
for _, addr := range cfg.URLs {
derpMap, err := loadDERPMapFromURL(addr)
for _, path := range cfg.Paths {
derpMap, err := loadDERPMapFromPath(path)
if err != nil {
return nil, err
}