nix
/
lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to use newest Python

This commit is contained in:
niten 2023-06-27 14:43:26 -07:00
parent e2ce36d2f8
commit ed86976d84
1 changed files with 78 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/fudo/adguard-dns-proxy.nix
View File

@ -9,17 +9,16 @@ let
get-basename = filename: get-basename = filename:
head (builtins.match "^[a-zA-Z0-9]+-(.+)$" (baseNameOf filename)); head (builtins.match "^[a-zA-Z0-9]+-(.+)$" (baseNameOf filename));
format-json-file = filename: pkgs.stdenv.mkDerivation { format-json-file = filename:
pkgs.stdenv.mkDerivation {
name = "formatted-${get-basename filename}"; name = "formatted-${get-basename filename}";
phases = [ "installPhase" ]; phases = [ "installPhase" ];
buildInputs = with pkgs; [ python ]; buildInputs = with pkgs; [ python3 ];
installPhase = "python -mjson.tool ${filename} > $out"; installPhase = "python -mjson.tool ${filename} > $out";
}; };
admin-passwd-file = admin-passwd-file =
pkgs.lib.passwd.stablerandom-passwd-file pkgs.lib.passwd.stablerandom-passwd-file "adguard-dns-proxy-admin"
"adguard-dns-proxy-admin"
config.instance.build-seed; config.instance.build-seed;
filterOpts = { filterOpts = {
@ -41,26 +40,15 @@ let
}; };
}; };
generate-config = { dns, generate-config = { dns, http, filters, verbose, upstream-dns, bootstrap-dns
http, , blocked-hosts, enable-dnssec, local-domain-name, ... }: {
filters,
verbose,
upstream-dns,
bootstrap-dns,
blocked-hosts,
enable-dnssec,
local-domain-name,
... }: {
bind_host = http.listen-ip; bind_host = http.listen-ip;
bind_port = http.listen-port; bind_port = http.listen-port;
users = [ users = [{
{
name = "admin"; name = "admin";
password = pkgs.lib.passwd.bcrypt-passwd password = pkgs.lib.passwd.bcrypt-passwd "adguard-dns-proxy-admin"
"adguard-dns-proxy-admin"
admin-passwd-file; admin-passwd-file;
} }];
];
auth_attempts = 5; auth_attempts = 5;
block_auth_min = 30; block_auth_min = 30;
web_session_ttl = 720; web_session_ttl = 720;
@ -81,7 +69,7 @@ let
url = filter.url; url = filter.url;
}) filters; }) filters;
dhcp.enabled = false; dhcp.enabled = false;
clients = []; clients = [ ];
verbose = verbose; verbose = verbose;
schema_version = 10; schema_version = 10;
}; };
@ -127,7 +115,8 @@ in {
default = [ default = [
{ {
name = "AdGuard DNS filter"; name = "AdGuard DNS filter";
url = "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"; url =
"https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt";
} }
{ {
name = "AdAway Default Blocklist"; name = "AdAway Default Blocklist";
@ -147,11 +136,7 @@ in {
blocked-hosts = mkOption { blocked-hosts = mkOption {
type = listOf str; type = listOf str;
description = "List of hosts to explicitly block."; description = "List of hosts to explicitly block.";
default = [ default = [ "version.bind" "id.server" "hostname.bind" ];
"version.bind"
"id.server"
"hostname.bind"
];
}; };
enable-dnssec = mkOption { enable-dnssec = mkOption {
@ -193,7 +178,8 @@ in {
allowed-networks = mkOption { allowed-networks = mkOption {
type = nullOr (listOf str); type = nullOr (listOf str);
description = "Optional list of networks with which this job may communicate."; description =
"Optional list of networks with which this job may communicate.";
default = null; default = null;
}; };
@ -220,9 +206,7 @@ in {
group = cfg.user; group = cfg.user;
}; };
groups.${cfg.user} = { groups.${cfg.user} = { members = [ cfg.user ]; };
members = [ cfg.user ];
};
}; };
fudo = { fudo = {
@ -234,10 +218,11 @@ in {
}; };
}; };
system.services.adguard-dns-proxy = let system.services.adguard-dns-proxy =
cfg-path = "/run/adguard-dns-proxy/config.yaml"; let cfg-path = "/run/adguard-dns-proxy/config.yaml";
in { in {
description = "DNS Proxy for ad filtering and DNS-over-HTTPS lookups."; description =
"DNS Proxy for ad filtering and DNS-over-HTTPS lookups.";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
after = [ "syslog.target" ]; after = [ "syslog.target" ];
requires = [ "network.target" ]; requires = [ "network.target" ];