replace adguardhome with dnsmasq
This commit is contained in:
parent
2d61c06946
commit
7c7b45995d
6 changed files with 17 additions and 57 deletions
|
@ -1,44 +0,0 @@
|
||||||
{
|
|
||||||
vars,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.adguardhome = {
|
|
||||||
enable = true;
|
|
||||||
mutableSettings = false;
|
|
||||||
port = 23489;
|
|
||||||
settings = {
|
|
||||||
dhcp.enabled = false;
|
|
||||||
dns = {
|
|
||||||
upstream_dns = [
|
|
||||||
"quic://dns.nextdns.io"
|
|
||||||
"https://cloudflare-dns.com/dns-query"
|
|
||||||
"tls://unfiltered.adguard-dns.com"
|
|
||||||
"https://dns10.quad9.net/dns-query"
|
|
||||||
];
|
|
||||||
bind_hosts = [vars.tailnet.hopper];
|
|
||||||
bootstrap_dns = ["1.1.1.1" "8.8.8.8"];
|
|
||||||
};
|
|
||||||
filtering = {
|
|
||||||
rewrites = lib.concatLists (lib.mapAttrsToList (n: v: [
|
|
||||||
{
|
|
||||||
domain = "${n}.xun.host";
|
|
||||||
answer = v;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
domain = "*.${n}.xun.host";
|
|
||||||
answer = v;
|
|
||||||
}
|
|
||||||
])
|
|
||||||
vars.tailnet);
|
|
||||||
};
|
|
||||||
filters = [
|
|
||||||
{
|
|
||||||
name = "OISD (Big)";
|
|
||||||
url = "https://big.oisd.nl";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -49,7 +49,6 @@ in {
|
||||||
|
|
||||||
slskd = mkPrivateEntry "slskd" "localhost:${toString config.services.slskd.settings.web.port}";
|
slskd = mkPrivateEntry "slskd" "localhost:${toString config.services.slskd.settings.web.port}";
|
||||||
prometheus = mkPrivateEntry "prometheus" "${bridge}:${toString config.services.prometheus.port}";
|
prometheus = mkPrivateEntry "prometheus" "${bridge}:${toString config.services.prometheus.port}";
|
||||||
adguard = mkPrivateEntry "adguard" "${bridge}:${toString config.services.adguardhome.port}";
|
|
||||||
transmission = mkPrivateEntry "transmission" "localhost:${toString config.services.transmission.settings.rpc-port}";
|
transmission = mkPrivateEntry "transmission" "localhost:${toString config.services.transmission.settings.rpc-port}";
|
||||||
dash = mkPrivateEntry "dash" "${bridge}:${toString config.services.homepage-dashboard.listenPort}";
|
dash = mkPrivateEntry "dash" "${bridge}:${toString config.services.homepage-dashboard.listenPort}";
|
||||||
absPriv = mkPrivateEntry "abs" "${bridge}:${toString config.services.audiobookshelf.port}";
|
absPriv = mkPrivateEntry "abs" "${bridge}:${toString config.services.audiobookshelf.port}";
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./acme.nix
|
./acme.nix
|
||||||
./adguard.nix
|
|
||||||
./audiobookshelf.nix
|
./audiobookshelf.nix
|
||||||
./caddy.nix
|
./caddy.nix
|
||||||
|
./dnsmasq.nix
|
||||||
./glances.nix
|
./glances.nix
|
||||||
./homepage.nix
|
./homepage.nix
|
||||||
./minecraft.nix
|
./minecraft.nix
|
||||||
|
|
16
sys/machines/hopper/lab/dnsmasq.nix
Normal file
16
sys/machines/hopper/lab/dnsmasq.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
vars,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
services.dnsmasq = {
|
||||||
|
enable = true;
|
||||||
|
resolveLocalQueries = false;
|
||||||
|
settings = {
|
||||||
|
server = ["1.1.1.1" "8.8.8.8"];
|
||||||
|
interface = ["tailscale0"];
|
||||||
|
bind-interfaces = true;
|
||||||
|
address = lib.mapAttrsToList (n: v: "/.${n}.xun.host/${v}") vars.tailnet;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -57,16 +57,6 @@ in {
|
||||||
icon = "audiobookshelf";
|
icon = "audiobookshelf";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
|
||||||
"adguard home" = {
|
|
||||||
href = "http://adguard.hopper.xun.host";
|
|
||||||
icon = "adguard-home";
|
|
||||||
widget = {
|
|
||||||
type = "adguard";
|
|
||||||
url = "http://localhost:${toString config.services.adguardhome.port}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
"prometheus" = {
|
"prometheus" = {
|
||||||
href = "http://prometheus.hopper.xun.host";
|
href = "http://prometheus.hopper.xun.host";
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
networking.firewall = let
|
networking.firewall = let
|
||||||
allowTcpFromVPNToDefaultPorts = [
|
allowTcpFromVPNToDefaultPorts = [
|
||||||
config.services.prometheus.port
|
config.services.prometheus.port
|
||||||
config.services.adguardhome.port
|
|
||||||
config.services.vaultwarden.config.ROCKET_PORT
|
config.services.vaultwarden.config.ROCKET_PORT
|
||||||
config.services.homepage-dashboard.listenPort
|
config.services.homepage-dashboard.listenPort
|
||||||
config.services.audiobookshelf.port
|
config.services.audiobookshelf.port
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue