From 4cfc474105c1d57c5e031628ddd1a2dbdd930a01 Mon Sep 17 00:00:00 2001 From: quindecim Date: Mon, 4 Jan 2021 02:51:14 -0500 Subject: [PATCH] [UPSTREAM] - Remove test leftover / Explain the example allowlist https://github.com/DNSCrypt/dnscrypt-proxy/commit/3a5585f8a159cfa6d21f25c2fd38ae11ed3e32dd https://github.com/DNSCrypt/dnscrypt-proxy/commit/19dbd13c1b08a9477c5fa78e613f473364bdb5c5 --- config/example-docs/example-allowed-names.txt | 6 ++++++ config/example-docs/example-dnscrypt-proxy.toml | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/example-docs/example-allowed-names.txt b/config/example-docs/example-allowed-names.txt index 93de748..2557f45 100644 --- a/config/example-docs/example-allowed-names.txt +++ b/config/example-docs/example-allowed-names.txt @@ -15,8 +15,14 @@ ## ads[0-9]* | matches "ads" followed by one or more digits ## ads*.example* | *, ? and [] can be used anywhere, but prefixes/suffixes are faster + +# That one may be blocked due to 'tracker' being in the name. tracker.debian.org +# That one may be blocked due to 'ads' being in the name. +# However, blocking it prevents all sponsored links from the Google +# search engine from being opened. +googleadservices.com ## Time-based rules diff --git a/config/example-docs/example-dnscrypt-proxy.toml b/config/example-docs/example-dnscrypt-proxy.toml index 852abd7..12d9bde 100644 --- a/config/example-docs/example-dnscrypt-proxy.toml +++ b/config/example-docs/example-dnscrypt-proxy.toml @@ -766,8 +766,6 @@ fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familys # { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] } # ] -routes = { server_name='*', via = ['*'] } - # Skip resolvers incompatible with anonymization instead of using them directly