stubby: add uci support to init file

[feed/packages.git] / net / stubby / files / stubby.yml

diff --git a/net/stubby/files/stubby.yml b/net/stubby/files/stubby.yml
index 012b1d6fbf4e7144f91dcc578bf2e98716fba6b7..655352deb2b4fbeee35c5bd5d82cad771fb4927e 100644 (file)
--- a/net/stubby/files/stubby.yml
+++ b/net/stubby/files/stubby.yml
@@ -1,55 +1,25 @@
-#NOTE: See '/etc/stubby/stubby.yml.default' for original config file and descriptions
-
+# Note: by default on OpenWRT stubby configuration is handled via
+# the UCI system and the file /etc/config/stubby. If you want to
+# use this file to configure stubby, then set "option manual '1'"
+# in /etc/config/stubby.
 resolution_type: GETDNS_RESOLUTION_STUB
-
-dns_transport_list:
-  - GETDNS_TRANSPORT_TLS
-
+round_robin_upstreams: 1
+appdata_dir: "/var/lib/stubby"
 tls_authentication: GETDNS_AUTHENTICATION_REQUIRED
-
 tls_query_padding_blocksize: 128
-
-edns_client_subnet_private : 1
-
-round_robin_upstreams: 0
-
+edns_client_subnet_private: 1
 idle_timeout: 10000
-
 listen_addresses:
   - 127.0.0.1@5453
-  -  0::1@5453
-
+  - 0::1@5453
+dns_transport_list:
+  - GETDNS_TRANSPORT_TLS
 upstream_recursive_servers:
-# IPv6 addresses
-# # Cloudflare IPv6
   - address_data: 2606:4700:4700::1111
     tls_auth_name: "cloudflare-dns.com"
-    tls_pubkey_pinset:
-      - digest: "sha256"
-        value: yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc=
-  - address_data: 2606:4700:4700::1001
+  - address_data: 2606:4700:4700::1111
     tls_auth_name: "cloudflare-dns.com"
-    tls_pubkey_pinset:
-      - digest: "sha256"
-        value: yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc=
-
-# # Quad 9 IPv6
-#  - address_data: 2620:fe::10
-#    tls_auth_name: "dns.quad9.net"
-
-# IPv4 addresses
-# # Cloudflare servers
   - address_data: 1.1.1.1
     tls_auth_name: "cloudflare-dns.com"
-    tls_pubkey_pinset:
-      - digest: "sha256"
-        value: yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc=
   - address_data: 1.0.0.1
     tls_auth_name: "cloudflare-dns.com"
-    tls_pubkey_pinset:
-      - digest: "sha256"
-        value: yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc=
-
-# Quad 9 service
-#  - address_data: 9.9.9.10
-#    tls_auth_name: "dns.quad9.net"