From 7abb0ecea5c5d232ea689e118e683a694301b183 Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Wed, 12 Mar 2025 23:33:37 -0700
Subject: [PATCH] WIP: router: bring back lan10

---
 hosts/router/ifconfig.nix | 18 +++++-------------
 hosts/router/kea.nix      |  8 ++++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/hosts/router/ifconfig.nix b/hosts/router/ifconfig.nix
index 8469aec..5d54bd6 100644
--- a/hosts/router/ifconfig.nix
+++ b/hosts/router/ifconfig.nix
@@ -77,7 +77,7 @@ in
       # request the leases just for routing (so that the att box knows we're here)
       # actual ip assignments are static, based on $pdFromWan
       ia_pd 1/${ifs.lan.net6} -
-      # ia_pd 10/${ifs.lan10.net6} -
+      ia_pd 10/${ifs.lan10.net6} -
       # ia_pd 20/${pdFromWan}d::/64 -  # for opnsense (legacy services)
       ia_pd 30/${ifs.lan30.net6} -
       ia_pd 40/${ifs.lan40.net6} -
@@ -116,7 +116,7 @@ in
     };
 
     netdevs = {
-      # "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
+      "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
       "10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
       "10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
       "10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
@@ -133,23 +133,15 @@ in
       };
       "20-lan" = (mkLanConfig ifs.lan) // {
         vlan = [
-          # ifs.lan10.name
+          ifs.lan10.name
           ifs.lan20.name
           ifs.lan30.name
           ifs.lan40.name
           ifs.lan50.name
         ];
       };
-      # "30-vlan10" = mkLanConfig ifs.lan10;
-      "30-vlan20" = mkLanConfig ifs.lan20 // {
-        routes = [
-          {
-            # OPNsense subnet route
-            Destination = "${pdFromWan}d::/64";
-            Gateway = "fe80::1efd:8ff:fe71:954e";
-          }
-        ];
-      };
+      "30-vlan10" = mkLanConfig ifs.lan10;
+      "30-vlan20" = mkLanConfig ifs.lan20;
       "30-vlan30" = mkLanConfig ifs.lan30;
       "30-vlan40" = mkLanConfig ifs.lan40;
       "30-vlan50" = mkLanConfig ifs.lan50;
diff --git a/hosts/router/kea.nix b/hosts/router/kea.nix
index efe41b6..2932d3a 100644
--- a/hosts/router/kea.nix
+++ b/hosts/router/kea.nix
@@ -131,7 +131,7 @@ in
   services.kea.dhcp4.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      # ifs.lan10.name
+      ifs.lan10.name
       ifs.lan20.name
       ifs.lan30.name
       ifs.lan40.name
@@ -141,7 +141,7 @@ in
     ddns-qualifying-suffix = "4.default.${ldomain}";
     subnet4 = [
       ((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
-      # (mkDhcp4Subnet 10 ifs.lan10)
+      (mkDhcp4Subnet 10 ifs.lan10)
       ((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
       (mkDhcp4Subnet 30 ifs.lan30)
       (mkDhcp4Subnet 40 ifs.lan40)
@@ -153,7 +153,7 @@ in
   services.kea.dhcp6.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      # ifs.lan10.name
+      ifs.lan10.name
       # ifs.lan20.name  # Managed by Att box
       ifs.lan30.name
       ifs.lan40.name
@@ -164,7 +164,7 @@ in
     ddns-qualifying-suffix = "6.default.${ldomain}";
     subnet6 = [
       ((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
-      # (mkDhcp6Subnet 10 ifs.lan10)
+      (mkDhcp6Subnet 10 ifs.lan10)
       (mkDhcp6Subnet 30 ifs.lan30)
       (mkDhcp6Subnet 40 ifs.lan40)
       (mkDhcp6Subnet 50 ifs.lan50)