Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

Warn users when MagicDNS is set with no DNS servers

Browse Source
This commit is contained in:
Juan Font Alonso 2021-10-04 22:16:53 +02:00
parent 02bc7314f4
commit da4a9dadd5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/headscale/cli/utils.go
View File

@ -108,9 +108,13 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
dnsConfig.Domains = viper.GetStringSlice("dns_config.domains")
}
if len(dnsConfig.Nameservers) > 0 {
if viper.IsSet("dns_config.magic_dns") {
dnsConfig.Proxied = viper.GetBool("dns_config.magic_dns")
if viper.IsSet("dns_config.magic_dns") {
magicDNS := viper.GetBool("dns_config.magic_dns")
if len(dnsConfig.Nameservers) > 0 {
dnsConfig.Proxied = magicDNS
} else if magicDNS {
log.Warn().
Msg("Warning: dns_config.magic_dns is set, but no nameservers are configured. Ignoring magic_dns.")
}
}
@ -186,7 +190,7 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
TLSKeyPath: absPath(viper.GetString("tls_key_path")),
DNSConfig: dnsConfig,
ACMEEmail: viper.GetString("acme_email"),
ACMEURL: viper.GetString("acme_url"),
}