diff --git a/nixos/boxes/home/routing-common/default.nix b/nixos/boxes/home/routing-common/default.nix index 09915ff..bcc7011 100644 --- a/nixos/boxes/home/routing-common/default.nix +++ b/nixos/boxes/home/routing-common/default.nix @@ -229,12 +229,6 @@ in DHCP = "ipv4"; dns = [ "127.0.0.1" "::1" ]; dhcpV4Config.UseDNS = false; - routes = map (r: { routeConfig = r; }) [ - # { - # Destination = prefixes.ctrs.v4; - # Gateway = allAssignments.shill.routing.ipv4.address; - # } - ]; qdiscConfig = { Parent = "ingress"; @@ -308,13 +302,6 @@ in nat = { enable = true; externalInterface = "wan"; - # externalIP = assignments.internal.ipv4.address; - forwardPorts = [ - # { - # port = "http"; - # dst = allAssignments.middleman.internal.ipv4.address; - # } - ]; }; extraRules = '' table inet filter { diff --git a/nixos/boxes/home/routing-common/kea.nix b/nixos/boxes/home/routing-common/kea.nix index 78b3b54..b89c1b3 100644 --- a/nixos/boxes/home/routing-common/kea.nix +++ b/nixos/boxes/home/routing-common/kea.nix @@ -76,7 +76,9 @@ in ]; pools = [ { - pool = "192.168.68.120 - 192.168.71.240"; + pool = if index == 0 + then "192.168.68.120 - 192.168.69.255" + else "192.168.70.0 - 192.168.71.240"; } ]; reservations = [ @@ -103,7 +105,9 @@ in ]; pools = [ { - pool = "192.168.72.120 - 192.168.79.240"; + pool = if index == 0 + then "192.168.72.120 - 192.168.75.255" + else "192.168.76.0 - 192.168.79.240"; } ]; reservations = [