Merge: * DNS: use Quad9 as default server
Close #1116 * commit '82d0c3047b857651d351a7acd3f2e8bb262dfb4d': + client: change DNS settings text and examples to Quad9 * DNS: use Quad9 as default server
This commit is contained in:
commit
acd8da6f0a
|
@ -106,7 +106,7 @@
|
||||||
"encryption_settings": "Encryption settings",
|
"encryption_settings": "Encryption settings",
|
||||||
"dhcp_settings": "DHCP settings",
|
"dhcp_settings": "DHCP settings",
|
||||||
"upstream_dns": "Upstream DNS servers",
|
"upstream_dns": "Upstream DNS servers",
|
||||||
"upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream.",
|
"upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.",
|
||||||
"test_upstream_btn": "Test upstreams",
|
"test_upstream_btn": "Test upstreams",
|
||||||
"apply_btn": "Apply",
|
"apply_btn": "Apply",
|
||||||
"disabled_filtering_toast": "Disabled filtering",
|
"disabled_filtering_toast": "Disabled filtering",
|
||||||
|
|
|
@ -23,10 +23,10 @@ const Examples = props => (
|
||||||
<Trans>examples_title</Trans>:
|
<Trans>examples_title</Trans>:
|
||||||
<ol className="leading-loose">
|
<ol className="leading-loose">
|
||||||
<li>
|
<li>
|
||||||
<code>1.1.1.1</code> - {props.t('example_upstream_regular')}
|
<code>9.9.9.9</code> - {props.t('example_upstream_regular')}
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>tls://1dot1dot1dot1.cloudflare-dns.com</code> –
|
<code>tls://dns.quad9.net</code> –
|
||||||
<span>
|
<span>
|
||||||
<Trans
|
<Trans
|
||||||
components={[
|
components={[
|
||||||
|
@ -45,7 +45,7 @@ const Examples = props => (
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>https://cloudflare-dns.com/dns-query</code> –
|
<code>https://dns.quad9.net/dns-query</code> –
|
||||||
<span>
|
<span>
|
||||||
<Trans
|
<Trans
|
||||||
components={[
|
components={[
|
||||||
|
@ -64,7 +64,7 @@ const Examples = props => (
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>tcp://1.1.1.1</code> – <Trans>example_upstream_tcp</Trans>
|
<code>tcp://9.9.9.9</code> – <Trans>example_upstream_tcp</Trans>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>sdns://...</code> –
|
<code>sdns://...</code> –
|
||||||
|
@ -102,7 +102,7 @@ const Examples = props => (
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>[/example.local/]1.1.1.1</code> –
|
<code>[/example.local/]9.9.9.9</code> –
|
||||||
<span>
|
<span>
|
||||||
<Trans
|
<Trans
|
||||||
components={[
|
components={[
|
||||||
|
|
|
@ -30,10 +30,9 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
var defaultDNS = []string{
|
var defaultDNS = []string{
|
||||||
"https://1.1.1.1/dns-query",
|
"https://dns.quad9.net/dns-query",
|
||||||
"https://1.0.0.1/dns-query",
|
|
||||||
}
|
}
|
||||||
var defaultBootstrap = []string{"1.1.1.1", "1.0.0.1"}
|
var defaultBootstrap = []string{"9.9.9.9", "149.112.112.112"}
|
||||||
|
|
||||||
// Server is the main way to start a DNS server.
|
// Server is the main way to start a DNS server.
|
||||||
//
|
//
|
||||||
|
@ -68,7 +67,7 @@ func NewServer(dnsFilter *dnsfilter.Dnsfilter, stats stats.Stats, queryLog query
|
||||||
|
|
||||||
if runtime.GOARCH == "mips" || runtime.GOARCH == "mipsle" {
|
if runtime.GOARCH == "mips" || runtime.GOARCH == "mipsle" {
|
||||||
// Use plain DNS on MIPS, encryption is too slow
|
// Use plain DNS on MIPS, encryption is too slow
|
||||||
defaultDNS = []string{"1.1.1.1", "1.0.0.1"}
|
defaultDNS = defaultBootstrap
|
||||||
}
|
}
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue