mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
vanadium/secure_dns: simplify blocklist management
This commit is contained in:
parent
3eb030b8f4
commit
7a613e9a43
1 changed files with 4 additions and 33 deletions
|
|
@ -29,42 +29,13 @@
|
||||||
|
|
||||||
# Blocklists are made of one pattern per line.
|
# Blocklists are made of one pattern per line.
|
||||||
# https://github.com/DNSCrypt/dnscrypt-proxy/blob/fa59f990431a49b6485f63f96601bc7e64017bf8/dnscrypt-proxy/example-dnscrypt-proxy.toml#L583C4-L583C75
|
# https://github.com/DNSCrypt/dnscrypt-proxy/blob/fa59f990431a49b6485f63f96601bc7e64017bf8/dnscrypt-proxy/example-dnscrypt-proxy.toml#L583C4-L583C75
|
||||||
blocked_names.blocked_names_file = let
|
blocked_names.blocked_names_file = pkgs.concatText "dnsblocklist_combined" [
|
||||||
# Prevent building up reliance on chatbots
|
# Prevent building up reliance on chatbots
|
||||||
# Gotta preserve that thinking ability of my smoof bwain
|
# Gotta preserve that thinking ability of my smoof bwain
|
||||||
ai_list = let
|
pkgs.ai_blocklist
|
||||||
src = pkgs.fetchFromGitHub {
|
pkgs.hategroup_blocklist
|
||||||
owner = "laylavish";
|
|
||||||
repo = "uBlockOrigin-HUGE-AI-Blocklist";
|
|
||||||
rev = "9bb188e2701138e03f73bacebd6b19b181ca0012";
|
|
||||||
hash = "sha256-p3wfR28DH6V8BHn9DT10d09Yq3mdbBecWwlR1CdDYUA=";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
lib.pipe (builtins.readFile "${src}/noai_hosts.txt") [
|
|
||||||
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case
|
|
||||||
(lib.splitString "\n")
|
|
||||||
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x)))
|
|
||||||
(builtins.map (x: builtins.elemAt (lib.splitString " " x) 1)) # remove 0.0.0.0
|
|
||||||
];
|
];
|
||||||
|
|
||||||
hategroup_list = let
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "chigh";
|
|
||||||
repo = "hategroup-dnsbl";
|
|
||||||
rev = "cc19c050997d5f54014bb20c764b131e003dfb17";
|
|
||||||
hash = "sha256-SZBrjIBUw687MdrbOV7WrP5IhAAtKvPL2GqdcICHNvQ=";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
lib.pipe (builtins.readFile "${src}/blocklist.txt") [
|
|
||||||
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case
|
|
||||||
(lib.splitString "\n")
|
|
||||||
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x)))
|
|
||||||
];
|
|
||||||
|
|
||||||
combined_lists = ai_list ++ hategroup_list;
|
|
||||||
in
|
|
||||||
pkgs.writeText "dnsblocklist" (builtins.concatStringsSep "\n" combined_lists);
|
|
||||||
|
|
||||||
# Add this to test if dnscrypt-proxy is actually used to resolve DNS requests
|
# Add this to test if dnscrypt-proxy is actually used to resolve DNS requests
|
||||||
# query_log.file = "/var/log/dnscrypt-proxy/query.log";
|
# query_log.file = "/var/log/dnscrypt-proxy/query.log";
|
||||||
sources.public-resolvers = {
|
sources.public-resolvers = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue