chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

router: rublacklist api v2->v3; resolver script maintanability

Browse source
This commit is contained in:
chayleaf 2024-06-06 10:37:36 +07:00
parent 2b61423e72
commit beb834e04c
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
2 changed files with 476 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

747
system/hosts/router/avahi-resolver-v2.py
View file

File diff suppressed because it is too large Load diff

6
system/hosts/router/default.nix
View file

@ -894,10 +894,12 @@ in {
# fetch vpn_ips.json and vpn_domains.json for unbound # fetch vpn_ips.json and vpn_domains.json for unbound
script = '' script = ''
BLACKLIST=$(${pkgs.coreutils}/bin/mktemp) || exit 1 BLACKLIST=$(${pkgs.coreutils}/bin/mktemp) || exit 1
${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v2/ips/json/" -o "$BLACKLIST" || exit 1 ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/ips/" -o "$BLACKLIST" || exit 1
${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_ips.json ${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_ips.json
${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v2/domains/json/" -o "$BLACKLIST" || exit 1 ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/domains/" -o "$BLACKLIST" || exit 1
${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_domains.json ${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_domains.json
${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/dpi/" -o "$BLACKLIST" || exit 1
${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_dpi.json
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";