diff --git a/README.md b/README.md index 483a6544..cb59d271 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,13 @@ Anonymized DNS relays: # List of ODoH servers and relays -Oblivious DoH servers and relays: -- https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/odoh.md -- https://download.dnscrypt.info/dnscrypt-resolvers/v3/odoh.md +Oblivious DoH servers: +- https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/odoh-servers.md +- https://download.dnscrypt.info/dnscrypt-resolvers/v3/odoh-servers.md + +Oblivious DoH relays: +- https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/odoh-relays.md +- https://download.dnscrypt.info/dnscrypt-resolvers/v3/odoh-relays.md # Minisign public key diff --git a/utils/format.py b/utils/format.py index e0068bc3..58574507 100755 --- a/utils/format.py +++ b/utils/format.py @@ -202,8 +202,7 @@ If you want to contribute changes to a resolvers list, only edit files from the # Legacy if ( - os.path.basename(md_path) == "odoh.md" - or os.path.basename(md_path) == "odoh-relays.md" + os.path.basename(md_path) == "odoh-relays.md" or os.path.basename(md_path) == "odoh-servers.md" ): md_legacy_path = md_path diff --git a/v3/odoh.md b/v3/odoh.md deleted file mode 100644 index b88a0cff..00000000 --- a/v3/odoh.md +++ /dev/null @@ -1,126 +0,0 @@ -# *** THIS LIST IS DEPRECATED *** - -It was only used by 2.0.46 beta versions, and has since be split into -the `odoh-servers` and `odoh-relays` lists. - -Please update your configuration to use these two new lists instead, -as the combined list is going to be removed soon. - -~~~ - -Oblivious DNS-over-HTTPS servers and relays. - -By convention, entries whose name start with `odohrelay-` prefix are *relays* and names with an `odoh-` prefix are servers that can be reached through ODoH relays. - -Note that ODoH relays cannot be used with DNSCrypt servers, and DNSCrypt relays cannot be used to connect to ODoH servers. - -ODoH relays can also only connect to servers supporting the ODoH protocol, not regular DoH servers. - -In other words, only combine elements from that list together. - -To use that list, add this to the `[sources]` section of your `dnscrypt-proxy.toml` configuration file: - - [sources.'odoh'] - urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh.md'] - minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' - cache_file = 'odoh.md' - --- - - -## odoh-cloudflare - -Cloudflare ODoH server. -https://cloudflare.com - -sdns://BQcAAAAAAAAAF29kb2guY2xvdWRmbGFyZS1kbnMuY29tCi9kbnMtcXVlcnk - - -## odoh-crypto-sx - -ODoH target server. Anycast, no logs. -Backend hosted by Scaleway. Maintained by Frank Denis. - -sdns://BQcAAAAAAAAADm9kb2guY3J5cHRvLnN4Ci9kbnMtcXVlcnk - - -## odoh-id-gmail - -ODoH target server. Based in Singapore, no logs. -Filter ads, trackers and malware. - -sdns://BQMAAAAAAAAADGRvaC50aWFyLmFwcAUvb2RvaA - - -## odoh-jp.tiar.app - -ODoH target server. no logs. - -sdns://BQcAAAAAAAAAC2pwLnRpYXIuYXBwBS9vZG9o - - -## odoh-jp.tiarap.org - -ODoH target server via Cloudflare, no logs. - -sdns://BQcAAAAAAAAADWpwLnRpYXJhcC5vcmcFL29kb2g - - -## odoh-koki-ams - -Oblivious DoH target server in The Netherlands. No logs, No filter, DNSSEC. -Maintained by @kokial - -sdns://BQcAAAAAAAAAGG9kb2gtdGFyZ2V0LmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5 - - -## odoh-resolver4.dns.openinternet.io - -ODoH target server. no logs, no filter, DNSSEC. -Running on dedicated hardware colocated at Sonic.net in Santa Rosa, CA in the United States. - -Uses Sonic's recusrive DNS servers as upstream resolvers (but is not affiliated with Sonic -in any way). Provided by https://openinternet.io - -sdns://BQcAAAAAAAAAHXJlc29sdmVyNC5kbnMub3BlbmludGVybmV0LmlvCi9kbnMtcXVlcnk - - -## odoh-tiarap.org - -ODoH target server via Cloudflare, no logs. -Filter ads, trackers and malware. - -sdns://BQMAAAAAAAAADmRvaC50aWFyYXAub3JnBS9vZG9o - - -## odohrelay-crypto-sx - -Oblivious DoH relay running on Fastly Compute@Edge. -Maintained by Frank Denis. - -sdns://hQcAAAAAAAAAACCi3jNJDEdtNW4tvHN8J3lpIklSa2Wrj7qaNCgEgci9_BpvZG9oLXJlbGF5LmVkZ2Vjb21wdXRlLmFwcAEv - - -## odohrelay-koki-ams - -Oblivious DoH relay in The Netherlands. No logs. -Maintained by @kokial - -sdns://hQcAAAAAAAAADTUxLjE1LjEyNC4yMDgAGG9kb2gtbmwuYWxla2JlcmcubmV0OjQ0MwYvcHJveHk - - -## odohrelay-koki-bcn - -Oblivious DoH relay in Spain. No logs. -Maintained by @kokial - -sdns://hQcAAAAAAAAADjE4NS4yNTMuMTU0LjY2ABhvZG9oLWVzLmFsZWtiZXJnLm5ldDo0NDMGL3Byb3h5 - - -## odohrelay-surf - -SURFdomeinen oblivious DoH relay. -https://www.surf.nl - -sdns://hQcAAAAAAAAACjE0NS4wLjYuNTMgEbEC5rH2PlKJhNYCXzKxOCQfyIu9dRlXTXDJgy1T4egVb2RvaDEuc3VyZmRvbWVpbmVuLm5sBi9wcm94eQ - diff --git a/v3/odoh.md.minisig b/v3/odoh.md.minisig deleted file mode 100644 index 91eb4582..00000000 --- a/v3/odoh.md.minisig +++ /dev/null @@ -1,4 +0,0 @@ -untrusted comment: signature from minisign secret key -RWQf6LRCGA9i52/29pHJ52g6jKqM+dcQlQwP24va6pM6bL75UKYINVP8BS4xFiWgCiv6N8zfcC8UKuH+QLE/qqVrkne8GFT1DQ8= -trusted comment: timestamp:1629494125 file:odoh.md -q0GkdBUoVZl0t58p7wuwL4+5Ko0/WJ3PVHPFXy4amiOkQ9tpSvwjwYESRE0/UlhOW01+pmjqxgzuLF2xnAe4Cw==