devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-29 18:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixup! cmd/headscale/cli/utils: merge ip_prefix with ip_prefixes in config

Browse source
This commit is contained in:
Csaba Sarkadi 2022-01-29 16:27:36 +01:00
parent 74f26d3685
commit 0a1db89d33
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/headscale/cli/utils.go
View file

@ -251,7 +251,8 @@ func getHeadscaleConfig() headscale.Config {
// dedup
normalizedPrefixes := make(map[string]int, len(parsedPrefixes))
for i, p := range parsedPrefixes {
normalizedPrefixes[p.String()] = i
normalized, _ := p.Range().Prefix()
normalizedPrefixes[normalized.String()] = i
}
// convert back to list
@ -265,6 +266,8 @@ func getHeadscaleConfig() headscale.Config {
log.Warn().Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes)
}
log.Warn().Msgf("==> %v", prefixes)
return headscale.Config{
ServerURL: viper.GetString("server_url"),
Addr: viper.GetString("listen_addr"),