diff --git a/inventories/router.nix b/inventories/router.nix index a33f3cc..c893ec7 100644 --- a/inventories/router.nix +++ b/inventories/router.nix @@ -32,16 +32,14 @@ in # device tree in matthew-hardware: eth1 = the 2.5G "WAN" port, lan1 = the # 2.5G LAN port, lan2-lan5 = the 1G LAN ports (DSA on the MT7531 switch). roles.default.machines.stellio.settings = { - site = "w"; - siteId = 1; + site = "white-house"; + siteId = 8; # PPPoE on the ISP's VLAN 10, as on the liminix router it replaces # (routers/white-house); set to null if the ISP runs PPPoE untagged. - wan.interface = "eth1"; + wan.interface = "end1"; wan.vlanId = 10; - # 2.5G port carries all VLANs tagged (towards a managed switch / AP). - trunkPorts = [ "lan1" ]; # lan1 (2.5G): untagged mgmt port for on-site recovery. lan2-lan4 (1G): # untagged client ports on lan. lan5 is the pre-cutover staging uplink: # DHCP client into the old LAN (routers/white-house), SSH only, no VLAN @@ -54,6 +52,32 @@ in }; stagingPort = "lan5"; + # Both MT7976 radios broadcast the site SSID (same name and passphrase + # as the liminix router's "WhiteHouse"/"WhiteHouse-5", merged into one + # dual-band SSID) as an untagged access port on lan. Passphrase is the + # `wifi-WhiteHouse-passphrase` vars prompt. Channels as on the old + # router. Check the band mapping with `iw phy` (mt7986: phy0/wlan0 = + # 2.4 GHz, phy1/wlan1 = 5 GHz). + wifi = { + enable = true; + countryCode = "TH"; + networks.WhiteHouse.vlan = "lan"; + radios = { + wlan0 = { + band = "2g"; + channel = 2; + wifi6 = true; + networks = [ "WhiteHouse" ]; + }; + wlan1 = { + band = "5g"; + channel = 36; + wifi6 = true; + networks = [ "WhiteHouse" ]; + }; + }; + }; + # 10.1..0/24, router .1, DHCP pool .100-.199. vlans = { mgmt.id = 10;