mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

fix: adguardhome config organization changed, also redirect some internal services to the new internal proxy

Browse source
This commit is contained in:
oddlama 2024-05-19 18:18:20 +02:00
parent 3d12add14d
commit 34fd783e60
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
1 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

79
hosts/ward/guests/adguardhome.nix
View file

@ -51,68 +51,71 @@ in {
topology.self.services.adguardhome.info = "https://" + adguardhomeDomain; topology.self.services.adguardhome.info = "https://" + adguardhomeDomain;
services.adguardhome = { services.adguardhome = {
enable = true; enable = true;
# TODO allow mutable settings, replace 123.123.123.123 with
# simpler sed dns.host_addr logic.
mutableSettings = false; mutableSettings = false;
settings = { settings = {
host = "0.0.0.0"; host = "0.0.0.0";
port = 3000; port = 3000;
dns = { dns = {
bind_hosts = [
# This dummy address passes the configuration check and will
# later be replaced by the actual interface address.
"123.123.123.123"
];
# allowed_clients = [ # allowed_clients = [
# ]; # ];
#trusted_proxied = []; #trusted_proxies = [];
ratelimit = 60; ratelimit = 60;
upstream_dns = [ upstream_dns = [
"1.1.1.1" "1.1.1.1"
"2606:4700:4700::1111" # FIXME: enable ipv6 "2606:4700:4700::1111"
"8.8.8.8" "8.8.8.8"
"2001:4860:4860::8844" # FIXME: enable ipv6 "2001:4860:4860::8844"
]; ];
bootstrap_dns = [ bootstrap_dns = [
"1.1.1.1" "1.1.1.1"
"2606:4700:4700::1111" # FIXME: enable ipv6 "2606:4700:4700::1111"
"8.8.8.8" "8.8.8.8"
"2001:4860:4860::8844" # FIXME: enable ipv6 "2001:4860:4860::8844"
]; ];
dhcp.enabled = false; dhcp.enabled = false;
};
filtering.rewrites = [
# Undo the /etc/hosts entry so we don't answer with the internal # Undo the /etc/hosts entry so we don't answer with the internal
# wireguard address for influxdb # wireguard address for influxdb
rewrites = [ {
{ domain = nodes.sentinel.config.networking.providedDomains.influxdb;
domain = nodes.sentinel.config.networking.providedDomains.influxdb; answer = config.repo.secrets.global.domains.me;
answer = config.repo.secrets.global.domains.me; }
} # Use the local mirror-proxy for some services (not necessary, just for speed)
]; {
filters = [ domain = nodes.sentinel.config.networking.providedDomains.grafana;
{ answer = "192.168.1.1";
name = "AdGuard DNS filter"; }
url = "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"; {
enabled = true; domain = nodes.sentinel.config.networking.providedDomains.immich;
} answer = "192.168.1.1";
{ }
name = "AdAway Default Blocklist"; ];
url = "https://adaway.org/hosts.txt"; filters = [
enabled = true; {
} name = "AdGuard DNS filter";
{ url = "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt";
name = "OISD (Big)"; enabled = true;
url = "https://big.oisd.nl"; }
enabled = true; {
} name = "AdAway Default Blocklist";
]; url = "https://adaway.org/hosts.txt";
}; enabled = true;
}
{
name = "OISD (Big)";
url = "https://big.oisd.nl";
enabled = true;
}
];
}; };
}; };
systemd.services.adguardhome = { systemd.services.adguardhome = {
preStart = lib.mkAfter '' preStart = lib.mkAfter ''
INTERFACE_ADDR=$(${pkgs.iproute2}/bin/ip -family inet -brief addr show lan | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+") INTERFACE_ADDR=$(${pkgs.iproute2}/bin/ip -family inet -brief addr show lan | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+") \
sed -i -e "s/123.123.123.123/$INTERFACE_ADDR/" "$STATE_DIRECTORY/AdGuardHome.yaml" ${lib.getExe pkgs.yq-go} -i '.dns.bind_hosts = [strenv(INTERFACE_ADDR)]' \
"$STATE_DIRECTORY/AdGuardHome.yaml"
''; '';
serviceConfig.RestartSec = lib.mkForce "60"; # Retry every minute serviceConfig.RestartSec = lib.mkForce "60"; # Retry every minute
}; };