From 4d07cf8c362292ced7814d385e23aa8b8c026113 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Sun, 6 Aug 2023 10:38:32 -0400
Subject: [PATCH] nixos/routnerr-3: Metronet wan1

---
 nixos/routnerr-3/networking.nix | 37 ++++-----------------------------
 nixos/routnerr-3/nftables.nix   |  4 ++--
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/nixos/routnerr-3/networking.nix b/nixos/routnerr-3/networking.nix
index 46d3ec5..de85079 100644
--- a/nixos/routnerr-3/networking.nix
+++ b/nixos/routnerr-3/networking.nix
@@ -143,11 +143,8 @@ in {
     };
 
     # Wired WAN: Metronet 10GbE.
-    # TODO(mdlayher): enable!
     links."11-wan1" = ethLink "wan1" "f4:90:ea:00:c7:91";
     networks."11-wan1" = {
-      enable = false;
-
       matchConfig.Name = "wan1";
       networkConfig.DHCP = "yes";
       # Never accept ISP DNS or search domains for any DHCP/RA family.
@@ -160,39 +157,13 @@ in {
 
         # Prioritize Metronet IPv4.
         RouteMetric = 100;
+
+        # Experiment.
+        RequestBroadcast = true;
       };
       dhcpV6Config = {
         # TODO: ???.
-        PrefixDelegationHint = "::/48";
-
-        UseDNS = false;
-      };
-      ipv6AcceptRAConfig = {
-        UseDNS = false;
-        UseDomains = false;
-      };
-    };
-
-    # Wired WAN: Metronet 1GbE.
-    # TODO(mdlayher): remove once wan1 is up.
-    links."11-wan2" = ethLink "wan2" "f4:90:ea:00:c7:8e";
-    networks."11-wan2" = {
-      matchConfig.Name = "wan2";
-      networkConfig.DHCP = "yes";
-      # Never accept ISP DNS or search domains for any DHCP/RA family.
-      dhcpV4Config = {
-        UseDNS = false;
-        UseDomains = false;
-
-        # Don't release IPv4 address on restart/reboots to avoid churn.
-        SendRelease = false;
-
-        # Prioritize Metronet IPv4.
-        RouteMetric = 100;
-      };
-      dhcpV6Config = {
-        # TODO: ???.
-        PrefixDelegationHint = "::/48";
+        PrefixDelegationHint = "::/56";
 
         UseDNS = false;
       };
diff --git a/nixos/routnerr-3/nftables.nix b/nixos/routnerr-3/nftables.nix
index 9a26fcc..8905286 100644
--- a/nixos/routnerr-3/nftables.nix
+++ b/nixos/routnerr-3/nftables.nix
@@ -22,8 +22,8 @@ let
   mkCSV = lib.concatMapStrings (ifi: "${ifi.name}, ");
 
   # WAN interfaces.
-  unmetered_wans = with vars.interfaces; [ wan0 wan1 wan2 ];
-  all_wans = with vars.interfaces; [ wan0 wan1 wan2 ];
+  unmetered_wans = with vars.interfaces; [ wan0 wan1 ];
+  all_wans = with vars.interfaces; [ wan0 wan1 ];
 
   # LAN interfaces, segmented into trusted, limited, and untrusted groups.
   metered_lans = with vars.interfaces; [ mgmt0 lan0 ];