From: Jan Janssen Date: Fri, 26 Mar 2021 15:37:33 +0000 (+0100) Subject: resolved.conf: Add hostnames for default DNS servers X-Git-Tag: v249-rc1~495 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a83ddc08d66277b9bf1e374a3e1e9bc21ce12cdd;p=thirdparty%2Fsystemd.git resolved.conf: Add hostnames for default DNS servers --- diff --git a/meson_options.txt b/meson_options.txt index d96d4e3f047..9441b88dec5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -269,7 +269,7 @@ option('dns-over-tls', type : 'combo', choices : ['auto', 'gnutls', 'openssl', ' description : 'DNS-over-TLS support') option('dns-servers', type : 'string', description : 'space-separated list of default DNS servers', - value : '1.1.1.1 8.8.8.8 1.0.0.1 8.8.4.4 2606:4700:4700::1111 2001:4860:4860::8888 2606:4700:4700::1001 2001:4860:4860::8844') + value : '1.1.1.1#cloudflare-dns.com 8.8.8.8#dns.google 1.0.0.1#cloudflare-dns.com 8.8.4.4#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2001:4860:4860::8888#dns.google 2606:4700:4700::1001#cloudflare-dns.com 2001:4860:4860::8844#dns.google') option('ntp-servers', type : 'string', description : 'space-separated list of default NTP servers', value : 'time1.google.com time2.google.com time3.google.com time4.google.com') diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in index f88a4e97c0d..874bd2b6ee5 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -16,9 +16,9 @@ [Resolve] # Some examples of DNS servers which may be used for DNS= and FallbackDNS=: -# Cloudflare: 1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 -# Google: 8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 -# Quad9: 9.9.9.9 2620:fe::fe +# Cloudflare: 1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com +# Google: 8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google +# Quad9: 9.9.9.9#dns.quad9.net 2620:fe::fe#dns.quad9.net #DNS= #FallbackDNS=@DNS_SERVERS@ #Domains=