Merge branch 'fix/542' into fix/596

This commit is contained in:
Aleksey Dmitrevskiy
2019-02-28 11:16:03 +03:00
6 changed files with 138 additions and 12 deletions

View File

@@ -61,6 +61,7 @@ type dnsConfig struct {
}
var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
var defaultBootstrap = []string{"1.1.1.1"}
type tlsConfigSettings struct {
Enabled bool `yaml:"enabled" json:"enabled"` // Enabled is the encryption (DOT/DOH/HTTPS) status
@@ -114,8 +115,8 @@ var config = configuration{
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false,
BootstrapDNS: "8.8.8.8:53",
},
UpstreamDNS: defaultDNS,
},