Skip to content

feat(router): ipv6 only + jool / nat64 #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnae wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(router): ipv6 only + jool / nat64 #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions configurations/nixos/x86_64-linux/alnitak.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@
args.auth-key = "file:/var/run/agenix/ts-google-9k";
};

services.jae.router = {
enable = true;
useNextDns = true;
nextDnsEnvFile = "/var/run/agenix/nextdns";
restrictedMacs = [
"5c:e0:c5:8a:24:6a"
"b4:18:d1:ab:4e:5a"
];
upstreamDnsServers = [
"2a07:a8c1::"
"45.90.30.0"
"2a07:a8c0::"
"45.90.28.0"
];
externalInterface = "enp1s0";
internalInterface = "enp2s0";
internalInterfaceIP = "192.168.20.1";
dnsMasqSettings.no-resolv = true;
dnsMasqSettings.bogus-priv = true;
dnsMasqSettings.strict-order = true;
};
# services.jae.router = {
# enable = true;
# useNextDns = true;
# nextDnsEnvFile = "/var/run/agenix/nextdns";
# restrictedMacs = [
# "5c:e0:c5:8a:24:6a"
# "b4:18:d1:ab:4e:5a"
# ];
# upstreamDnsServers = [
# "2a07:a8c1::"
# "45.90.30.0"
# "2a07:a8c0::"
# "45.90.28.0"
# ];
# externalInterface = "enp1s0";
# internalInterface = "enp2s0";
# internalInterfaceIP = "192.168.20.1";
# dnsMasqSettings.no-resolv = true;
# dnsMasqSettings.bogus-priv = true;
# dnsMasqSettings.strict-order = true;
# };

age.secrets = {
ts-google-9k = {
Expand Down
2 changes: 0 additions & 2 deletions configurations/nixos/x86_64-linux/cygnus.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
networkConfig.IgnoreCarrierLoss = "3s";
networkConfig.IPv6PrivacyExtensions = "yes";
networkConfig.IPv6AcceptRA = "yes";
## don't use this by default (rely on tailscale dns only)
networkConfig.DNSDefaultRoute = false;
};
};
};
Expand Down
44 changes: 16 additions & 28 deletions configurations/nixos/x86_64-linux/sagittarius.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
devices = ["/dev/mapper/encrypted_root"];
};

ephemeralRoot = true;
imports = [
../../../profiles/admin-user/home-manager.nix
../../../profiles/admin-user/user.nix
Expand Down Expand Up @@ -82,31 +83,21 @@

services.jae.router = {
enable = true;
useNextDns = false;
nextDnsEnvFile = "/var/run/agenix/nextdns";
restrictedMacs = [
"5c:e0:c5:8a:24:6a"
"b4:18:d1:ab:4e:5a"
];
upstreamDnsServers = [
"2a07:a8c1::"
"45.90.30.0"
"2a07:a8c0::"
"45.90.28.0"
];
externalInterface = "enp1s0f0";
internalInterface = "enp2s0";
internalInterfaceIP = "192.168.20.1";
dnsMasqSettings.no-resolv = true;
dnsMasqSettings.bogus-priv = true;
dnsMasqSettings.strict-order = true;
};

services.prometheus.exporters = {
dnsmasq = {
enable = true;
dnsmasqListenAddress = "localhost:5342";
};
enableNat64 = true; # Enable NAT64 for IPv4 access from IPv6-only clients

# Optional: Add DNS filtering with Blocky
# blockySettings = {
# blocking = {
# denylists = {
# ads = ["https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"];
# };
# clientGroupsBlock = {
# default = ["ads"];
# };
# };
# };
};

services.vmagent = {
Expand All @@ -121,10 +112,10 @@
in {
scrape_configs = [
{
job_name = "dnsmasq";
job_name = "blocky";
scrape_interval = "10s";
static_configs = [
{targets = ["127.0.0.1:9153"];}
{targets = ["127.0.0.1:4000"];}
];
inherit relabel_configs;
}
Expand All @@ -145,9 +136,6 @@
file = ../../../secrets/ts-google-9k.age;
owner = "1337";
};
nextdns = {
file = ../../../secrets/nextdns.age;
};
};

users.users.${adminUser.name}.shell = lib.mkForce pkgs.bashInteractive;
Expand Down
Loading