TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-25 12:37:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into configurable-mtls

Browse Source
This commit is contained in:
Kristoffer Dalby
2022-01-31 12:28:00 +00:00
committed by GitHub
parent 9de5c7f8b8 e05c5e0b93
commit 168b1bd579
43 changed files with 955 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app.go
View File

@@ -73,7 +73,7 @@ type Config struct {
ServerURL string
Addr string
EphemeralNodeInactivityTimeout time.Duration
IPPrefix netaddr.IPPrefix
IPPrefixes []netaddr.IPPrefix
PrivateKeyPath string
BaseDomain string
@@ -204,9 +204,7 @@ func NewHeadscale(cfg Config) (*Headscale, error) {
}
if app.cfg.DNSConfig != nil && app.cfg.DNSConfig.Proxied { // if MagicDNS
magicDNSDomains := generateMagicDNSRootDomains(
app.cfg.IPPrefix,
)
magicDNSDomains := generateMagicDNSRootDomains(app.cfg.IPPrefixes)
// we might have routes already from Split DNS
if app.cfg.DNSConfig.Routes == nil {
app.cfg.DNSConfig.Routes = make(map[string][]dnstype.Resolver)