From dee168e2874e213157c79b00fb26aaea64fae42b Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sun, 26 Nov 2023 16:17:44 +0200 Subject: [PATCH] systemd-resolved: merge provider configs --- etc/systemd/resolved.conf.d/dot-dns0-kids.conf | 8 -------- etc/systemd/resolved.conf.d/dot-dns0-open.conf | 8 -------- etc/systemd/resolved.conf.d/dot-dns0-zero.conf | 8 -------- etc/systemd/resolved.conf.d/dot-dns0.conf | 3 +++ etc/systemd/resolved.conf.d/dot-quad9-ecs.conf | 5 ----- etc/systemd/resolved.conf.d/dot-quad9.conf | 4 +++- 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 etc/systemd/resolved.conf.d/dot-dns0-kids.conf delete mode 100644 etc/systemd/resolved.conf.d/dot-dns0-open.conf delete mode 100644 etc/systemd/resolved.conf.d/dot-dns0-zero.conf delete mode 100644 etc/systemd/resolved.conf.d/dot-quad9-ecs.conf diff --git a/etc/systemd/resolved.conf.d/dot-dns0-kids.conf b/etc/systemd/resolved.conf.d/dot-dns0-kids.conf deleted file mode 100644 index ccb0206f..00000000 --- a/etc/systemd/resolved.conf.d/dot-dns0-kids.conf +++ /dev/null @@ -1,8 +0,0 @@ -[Resolve] -DNS=2a0f:fc80::1#kids.dns0.eu -DNS=2a0f:fc81::1#kids.dns0.eu -DNS=193.110.81.1#kids.dns0.eu -DNS=185.253.5.1#kids.dns0.eu -Domains=~. -DNSOverTLS=yes -Cache=yes diff --git a/etc/systemd/resolved.conf.d/dot-dns0-open.conf b/etc/systemd/resolved.conf.d/dot-dns0-open.conf deleted file mode 100644 index 912e9b3b..00000000 --- a/etc/systemd/resolved.conf.d/dot-dns0-open.conf +++ /dev/null @@ -1,8 +0,0 @@ -[Resolve] -DNS=2a0f:fc80::ffff#open.dns0.eu -DNS=2a0f:fc81::ffff#open.dns0.eu -DNS=193.110.81.254#open.dns0.eu -DNS=185.253.5.254#open.dns0.eu -Domains=~. -DNSOverTLS=yes -Cache=yes diff --git a/etc/systemd/resolved.conf.d/dot-dns0-zero.conf b/etc/systemd/resolved.conf.d/dot-dns0-zero.conf deleted file mode 100644 index 8e98bf10..00000000 --- a/etc/systemd/resolved.conf.d/dot-dns0-zero.conf +++ /dev/null @@ -1,8 +0,0 @@ -[Resolve] -DNS=2a0f:fc80::9#zero.dns0.eu -DNS=2a0f:fc81::9#zero.dns0.eu -DNS=193.110.81.9#zero.dns0.eu -DNS=185.253.5.9#zero.dns0.eu -Domains=~. -DNSOverTLS=yes -Cache=yes diff --git a/etc/systemd/resolved.conf.d/dot-dns0.conf b/etc/systemd/resolved.conf.d/dot-dns0.conf index 3c587335..10c26c12 100644 --- a/etc/systemd/resolved.conf.d/dot-dns0.conf +++ b/etc/systemd/resolved.conf.d/dot-dns0.conf @@ -3,6 +3,9 @@ DNS=2a0f:fc80::#dns0.eu DNS=2a0f:fc81::#dns0.eu DNS=193.110.81.0#dns0.eu DNS=185.253.5.0#dns0.eu +#DNS=2a0f:fc80::1#kids.dns0.eu 2a0f:fc81::1#kids.dns0.eu 193.110.81.1#kids.dns0.eu 185.253.5.1#kids.dns0.eu +#DNS=2a0f:fc80::ffff#open.dns0.eu 2a0f:fc81::ffff#open.dns0.eu 193.110.81.254#open.dns0.eu 185.253.5.254#open.dns0.eu +#DNS=2a0f:fc80::9#zero.dns0.eu 2a0f:fc81::9#zero.dns0.eu 193.110.81.9#zero.dns0.eu 185.253.5.9#zero.dns0.eu Domains=~. DNSOverTLS=yes Cache=yes diff --git a/etc/systemd/resolved.conf.d/dot-quad9-ecs.conf b/etc/systemd/resolved.conf.d/dot-quad9-ecs.conf deleted file mode 100644 index 69ef8e58..00000000 --- a/etc/systemd/resolved.conf.d/dot-quad9-ecs.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Resolve] -DNS=2620:fe::11#dns11.quad9.net 149.112.112.11#dns11.quad9.net 2620:fe::fe:11#dns11.quad9.net 9.9.9.11#dns11.quad9.net -Domains=~. -DNSOverTLS=yes -Cache=yes diff --git a/etc/systemd/resolved.conf.d/dot-quad9.conf b/etc/systemd/resolved.conf.d/dot-quad9.conf index 42603cbc..2e2f4fbb 100644 --- a/etc/systemd/resolved.conf.d/dot-quad9.conf +++ b/etc/systemd/resolved.conf.d/dot-quad9.conf @@ -1,5 +1,7 @@ [Resolve] -DNS=2620:fe::9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 9.9.9.9#dns.quad9.net +#DNS=2620:fe::9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 9.9.9.9#dns.quad9.net +# ECS +DNS=2620:fe::11#dns11.quad9.net 149.112.112.11#dns11.quad9.net 2620:fe::fe:11#dns11.quad9.net 9.9.9.11#dns11.quad9.net Domains=~. DNSOverTLS=yes Cache=yes