dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nixos/home: Rework river WAN to single-tag VLAN 140/141

Browse Source 
Digiweb's ONT delivers its untagged management traffic (192.168.100.0/24)
alongside the tagged ISP VLAN 10. The switch feeding river now tags the ONT's
untagged port as wan-pon-ont (140) and swaps the ISP VLAN 10 to wan-pon-isp
(141) on ingress, so both reach river single-tagged: river takes an address in
the ONT's /24 on 140 to reach its web UI, and PPPoE runs directly on 141.

Replaces the old QinQ-into-131 (wanStacked) transport; the wan-pon (131) VLAN
constant is dropped and prefixes.ont added.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Jack O'Sullivan
2026-07-23 01:17:30 +01:00
parent 4d4c05ea70
commit 832d0b5542
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/constants.nix
+9 -1
View File
@@ -312,9 +312,14 @@ rec {
lo = 110;
untrusted = 120;
wan = 130;
wan-pon = 131;
# Digiweb delivers the ISP VLAN (pon-isp, 10) single-tagged at the ONT alongside the ONT's
# own untagged management traffic. The switch feeding river tags the untagged ONT port as
# wan-pon-ont (140) and swaps ingress VLAN 10 to wan-pon-isp (141), so river sees both
# single-tagged and never has to touch VLAN 10 itself (PPPoE runs on wan-pon-isp).
pon-isp = 10;
wan-pon-ont = 140;
wan-pon-isp = 141;
};
hiMTU = 9000;
routers = [
@@ -330,6 +335,9 @@ rec {
modem = {
v4 = "192.168.0.0/24";
};
ont = {
v4 = "192.168.100.0/24";
};
all = {
v4 = "192.168.64.0/18";
v6 = "2a0e:97c0:4d0::/60";