lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

swann: don't add mopup rules for wg-intfs, since we'll get that via BGP

Browse source
This commit is contained in:
Luke Granger-Brown 2023-07-19 23:28:58 +01:00
parent ca8f808647
commit 5d47f75c2f
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ops/nixos/swann/default.nix
View file

@ -177,22 +177,13 @@ in {
Table = rtID; Table = rtID;
}; };
} }
{
# Catch-all mop-up rule at the end.
routingPolicyRuleConfig = {
Family = "both";
Priority = relativePriority + 10090;
Table = rtID;
};
}
]; ];
}; };
tailscaleRule = priority: table: { tailscaleRule = priority: table: {
# Route Tailscale (fwmark 0x80000) via Wireguard first. # Route Tailscale (fwmark 0x80000) via Wireguard first.
routingPolicyRuleConfig = { routingPolicyRuleConfig = {
Family = "both"; Family = "both";
FirewallMark = hexToInt "0x80000"; FirewallMark = hexToInt "0x80000"; # Should be "0x80000/0xff0000"
Priority = priority; Priority = priority;
Table = table; Table = table;
}; };
@ -284,7 +275,14 @@ in {
}]) // { }]) // {
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
}; };
networks."40-en-gnet" = (physicalNetwork routeTables.gnet "0xcafe" []); networks."40-en-gnet" = (physicalNetwork routeTables.gnet "0xcafe" [{
# Catch-all mop-up rule at the end.
routingPolicyRuleConfig = {
Family = "both";
Priority = 32768;
Table = routeTables.gnet;
};
}]);
networks."40-br-internal" = { networks."40-br-internal" = {
networkConfig.VLAN = [ "vl-eduroam" ]; networkConfig.VLAN = [ "vl-eduroam" ];
}; };