Compare commits
3 commits
798e44fd1b
...
3fbf1a4436
| Author | SHA1 | Date | |
|---|---|---|---|
| 3fbf1a4436 | |||
| 09554029fe | |||
| 43cb9890c9 |
4 changed files with 153 additions and 19 deletions
|
|
@ -24,6 +24,7 @@ in
|
||||||
../../virtualisation/containers.nix
|
../../virtualisation/containers.nix
|
||||||
../../virtualisation/podman.nix
|
../../virtualisation/podman.nix
|
||||||
../../modules/inadyn.nix
|
../../modules/inadyn.nix
|
||||||
|
../../services/adguardhome.nix
|
||||||
../../modules/systemdNotify.nix
|
../../modules/systemdNotify.nix
|
||||||
../../services/postgres
|
../../services/postgres
|
||||||
../../services/mail.nix
|
../../services/mail.nix
|
||||||
|
|
@ -87,6 +88,7 @@ in
|
||||||
''}";
|
''}";
|
||||||
services.inadyn.domains = [
|
services.inadyn.domains = [
|
||||||
"felschr.com"
|
"felschr.com"
|
||||||
|
"dns.felschr.com"
|
||||||
"openpgpkey.felschr.com"
|
"openpgpkey.felschr.com"
|
||||||
"ldap.felschr.com"
|
"ldap.felschr.com"
|
||||||
"auth.felschr.com"
|
"auth.felschr.com"
|
||||||
|
|
|
||||||
107
services/adguardhome.nix
Normal file
107
services/adguardhome.nix
Normal file
|
|
@ -0,0 +1,107 @@
|
||||||
|
{ config, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.adguardhome;
|
||||||
|
host = "dns.felschr.com";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.adguardhome = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
dns = {
|
||||||
|
upstream_dns = [
|
||||||
|
"https://dns.mullvad.net/dns-query"
|
||||||
|
];
|
||||||
|
fallback_dns = [
|
||||||
|
"https://1.1.1.1/dns-query"
|
||||||
|
];
|
||||||
|
enable_dnssec = true;
|
||||||
|
};
|
||||||
|
# encryption
|
||||||
|
tls = {
|
||||||
|
enabled = true;
|
||||||
|
server_name = host;
|
||||||
|
port_https = 0;
|
||||||
|
port_dns_over_tls = 853;
|
||||||
|
port_dns_over_quic = 853;
|
||||||
|
port_dnscrypt = 0;
|
||||||
|
force_https = false; # handled by nginx
|
||||||
|
allow_unencrypted_doh = true;
|
||||||
|
strict_sni_check = false;
|
||||||
|
certificate_path = "/run/credentials/adguardhome.service/fullchain.pem";
|
||||||
|
private_key_path = "/run/credentials/adguardhome.service/key.pem";
|
||||||
|
};
|
||||||
|
# HINT: users needs to be set up manually:
|
||||||
|
# https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#password-reset
|
||||||
|
# users = [ { name = "felschr"; } ];
|
||||||
|
querylog = {
|
||||||
|
enabled = true;
|
||||||
|
interval = "24h";
|
||||||
|
};
|
||||||
|
statistics = {
|
||||||
|
enabled = true;
|
||||||
|
interval = "24h";
|
||||||
|
};
|
||||||
|
filtering = {
|
||||||
|
protection_enabled = true;
|
||||||
|
filtering_enabled = true;
|
||||||
|
safe_search.enabled = true;
|
||||||
|
rewrites = [
|
||||||
|
{
|
||||||
|
domain = "felschr.com";
|
||||||
|
answer = "home-server.tail05275.ts.net";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
domain = "*.felschr.com";
|
||||||
|
answer = "home-server.tail05275.ts.net";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
filters = [
|
||||||
|
{
|
||||||
|
name = "HaGeZi Multi Pro";
|
||||||
|
url = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt";
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "OISD (Big)";
|
||||||
|
url = "https://big.oisd.nl";
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "AdGuard DNS filter";
|
||||||
|
url = "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt";
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
whitelist_filters = [
|
||||||
|
{
|
||||||
|
name = "HaGeZi Whitelist-Referral";
|
||||||
|
url = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/whitelist-referral.txt";
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Hagezi Whitelist-UrlShortener";
|
||||||
|
url = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/whitelist-urlshortener.txt";
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.adguardhome.serviceConfig = {
|
||||||
|
LoadCredential = [
|
||||||
|
"fullchain.pem:/var/lib/acme/${host}/fullchain.pem"
|
||||||
|
"key.pem:/var/lib/acme/${host}/key.pem"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."${host}" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/".proxyPass = "http://localhost:${toString cfg.port}";
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [ 853 ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ 853 ];
|
||||||
|
}
|
||||||
|
|
@ -1,24 +1,49 @@
|
||||||
{ config, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
networking.nameservers = [
|
isAdguardHost = config.services.adguardhome.enable;
|
||||||
|
nameservers = {
|
||||||
|
local = [
|
||||||
"127.0.0.1"
|
"127.0.0.1"
|
||||||
"::1"
|
"::1"
|
||||||
];
|
];
|
||||||
networking.networkmanager.dns = "systemd-resolved";
|
remote = [
|
||||||
|
# LAN
|
||||||
|
"192.168.1.102#dns.felschr.com"
|
||||||
|
"fd1c:ca95:d74d::102#dns.felschr.com"
|
||||||
|
|
||||||
|
# Tailnet
|
||||||
|
"100.97.32.60#dns.felschr.com"
|
||||||
|
"fd7a:115c:a1e0::a0a1:203c#dns.felschr.com"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
networking.nameservers = if isAdguardHost then nameservers.local else nameservers.remote;
|
||||||
|
|
||||||
|
networking.nftables.enable = true;
|
||||||
|
networking.networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
dns = "systemd-resolved";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.network = {
|
||||||
|
enable = true;
|
||||||
|
wait-online.ignoredInterfaces = [ "tailscale0" ];
|
||||||
|
};
|
||||||
|
|
||||||
services.dnsmasq.enable = false;
|
services.dnsmasq.enable = false;
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# don't use fallback resolvers
|
dnsovertls = if isAdguardHost then "opportunistic" else "true";
|
||||||
fallbackDns = [ ];
|
fallbackDns = [
|
||||||
};
|
"194.242.2.2#dns.mullvad.net"
|
||||||
|
"194.242.2.4#base.dns.mullvad.net"
|
||||||
services.nextdns = {
|
"1.1.1.1#one.one.one.one"
|
||||||
enable = true;
|
"1.0.0.1#one.one.one.one"
|
||||||
arguments = [
|
|
||||||
"-config"
|
|
||||||
"b8e2f7"
|
|
||||||
];
|
];
|
||||||
|
extraConfig = lib.mkIf isAdguardHost ''
|
||||||
|
DNSStubListener=no
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,14 @@
|
||||||
table inet allow-incoming-traffic {
|
table inet allow-incoming-traffic {
|
||||||
chain allow-incoming {
|
chain allow-incoming {
|
||||||
type filter hook input priority -100; policy accept;
|
type filter hook input priority -100; policy accept;
|
||||||
tcp dport {80, 443, 2222} meta mark set 0x80000;
|
tcp dport {80, 443, 853, 2222} meta mark set 0x80000;
|
||||||
udp dport {80, 443, 2222} meta mark set 0x80000;
|
udp dport {80, 443, 853, 2222} meta mark set 0x80000;
|
||||||
}
|
}
|
||||||
|
|
||||||
chain allow-outgoing {
|
chain allow-outgoing {
|
||||||
type route hook output priority -100; policy accept;
|
type route hook output priority -100; policy accept;
|
||||||
tcp sport {80, 443, 2222} meta mark set 0x80000;
|
tcp sport {80, 443, 853, 2222} meta mark set 0x80000;
|
||||||
udp sport {80, 443, 2222} meta mark set 0x80000;
|
udp sport {80, 443, 853, 2222} meta mark set 0x80000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue