diff --git a/ops/nixos/blade-tuvok/default.nix b/ops/nixos/blade-tuvok/default.nix index 7ee3284f57..7e6cecc1d1 100644 --- a/ops/nixos/blade-tuvok/default.nix +++ b/ops/nixos/blade-tuvok/default.nix @@ -173,27 +173,33 @@ in { protocol static export4 { ipv4 {}; - route 92.118.30.0/24 via 92.118.30.0 bfd weight 1 # Virgin Media - via 92.118.30.4 bfd weight 2 # GNetwork - { + route 92.118.30.0/24 via 92.118.30.0 bfd { + # Virgin Media preference = 100; }; route 92.118.30.0/24 via 92.118.30.2 bfd { # EE preference = 10; }; + route 92.118.30.0/24 via 92.118.30.4 bfd { + # GNetwork + preference = 200; + }; }; protocol static export6 { ipv6 {}; - route 2a09:a443::/32 via 2a09:a442::1:1 bfd weight 1 # Virgin Media - via 2a09:a442::3:1 bfd weight 2 # GNetwork - { + route 2a09:a443::/32 via 2a09:a442::1:1 bfd { + # Virgin Media preference = 100; }; route 2a09:a443::/32 via 2a09:a442::2:1 bfd { # EE preference = 10; }; + route 2a09:a443::/32 via 2a09:a442::3:1 bfd { + # GNetwork + preference = 200; + }; }; protocol bfd { diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix index 7af7f06dc7..3dc1e8442f 100644 --- a/ops/nixos/swann/default.nix +++ b/ops/nixos/swann/default.nix @@ -574,21 +574,23 @@ in { protocol static export4 { ipv4 {}; - route 0.0.0.0/0 via 92.118.30.1 bfd weight 1 # Virgin Media - via 92.118.30.5 bfd weight 20 # GNetwork - { + route 0.0.0.0/0 via 92.118.30.1 bfd { + # Virgin Media preference = 100; }; route 0.0.0.0/0 via 92.118.30.3 bfd { # EE preference = 10; }; + route 0.0.0.0/0 via 92.118.30.5 bfd { + # GNetwork + preference = 200; + }; }; protocol static export6 { ipv6 {}; - route ::/0 via 2a09:a442::1:2 bfd weight 1 # Virgin Media - via 2a09:a442::3:2 bfd weight 20 # GNetwork - { + route ::/0 via 2a09:a442::1:2 bfd { + # Virgin Media preference = 100; krt_prefsrc = 2a09:a443::1; }; @@ -597,6 +599,11 @@ in { preference = 10; krt_prefsrc = 2a09:a443::1; }; + route ::/0 via 2a09:a442::3:2 bfd { + # GNetwork + preference = 200; + krt_prefsrc = 2a09:a443::1; + }; # Covering route... route 2a09:a443::/64 via "en-general";