nixos/estuary: Fix BIRD2 startup / route export to kernel

This commit is contained in:
Jack O'Sullivan 2022-10-08 21:13:16 +01:00
parent 401401f6bc
commit 8300e49b00
2 changed files with 20 additions and 5 deletions

View File

@ -38,10 +38,11 @@ in
router id from "wan"; router id from "wan";
protocol device {} protocol device {}
#protocol direct { protocol direct {
# interface "devplayer0"; interface "wan";
# ipv6; ipv4;
#} ipv6;
}
protocol static { protocol static {
# Special case: We have to do the routing on behalf of this _internal_ next-hop # Special case: We have to do the routing on behalf of this _internal_ next-hop
#route INTNET6 via "devplayer0"; #route INTNET6 via "devplayer0";
@ -65,7 +66,6 @@ in
} }
protocol kernel kernel6 { protocol kernel kernel6 {
ipv6 { ipv6 {
#import filter bgp_export;
import none; import none;
export filter { export filter {
if net ~ OWNNETSET6 then reject; if net ~ OWNNETSET6 then reject;

View File

@ -92,10 +92,25 @@
''; '';
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
bird2 =
let
waitOnline = "systemd-networkd-wait-online@wan.service";
in
{
after = [ waitOnline ];
requires = [ waitOnline ];
};
}; };
}; };
systemd.network = { systemd.network = {
config = {
networkConfig = {
ManageForeignRoutes = false;
};
};
links = { links = {
"10-wan" = { "10-wan" = {
matchConfig.MACAddress = "d0:50:99:fa:a7:99"; matchConfig.MACAddress = "d0:50:99:fa:a7:99";