diff --git a/hosts/carbon/configuration.nix b/hosts/carbon/configuration.nix index be6e8b4..1e6536f 100644 --- a/hosts/carbon/configuration.nix +++ b/hosts/carbon/configuration.nix @@ -70,20 +70,6 @@ }; }; - petabyte.policyrouting = { - enable = true; - rules6 = [ - { rule = "from all to fd00:152:152::/48 lookup 1000"; prio = 10000; } # OSPF - { rule = "from fd00:152:152::/48 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to fd00:152:152::/48 unreachable"; prio = 20000; } - ]; - rules4 = [ - { rule = "from all to 10.152.0.0/16 lookup 1000"; prio = 10000; } # OSPF - { rule = "from 10.152.0.0/16 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to 10.152.0.0/16 unreachable"; prio = 20000; } - ]; - }; - clerie.gre-tunnel = { enable = true; ipv4 = { @@ -123,7 +109,6 @@ } protocol kernel kernel_ospf6 { - kernel table 1000; ipv6 { table ospf6; export filter { @@ -135,7 +120,6 @@ } protocol kernel kernel_ospf4 { - kernel table 1000; ipv4 { table ospf4; export filter { diff --git a/hosts/gatekeeper/configuration.nix b/hosts/gatekeeper/configuration.nix index c247d5f..7793f3a 100644 --- a/hosts/gatekeeper/configuration.nix +++ b/hosts/gatekeeper/configuration.nix @@ -122,20 +122,6 @@ }; }; - petabyte.policyrouting = { - enable = true; - rules6 = [ - { rule = "from all to fd00:152:152::/48 lookup 1000"; prio = 10000; } # OSPF - { rule = "from fd00:152:152::/48 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to fd00:152:152::/48 unreachable"; prio = 20000; } - ]; - rules4 = [ - { rule = "from all to 10.152.0.0/16 lookup 1000"; prio = 10000; } # OSPF - { rule = "from 10.152.0.0/16 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to 10.152.0.0/16 unreachable"; prio = 20000; } - ]; - }; - clerie.gre-tunnel = { enable = true; ipv4 = { @@ -165,7 +151,6 @@ } protocol kernel kernel_ospf6 { - kernel table 1000; ipv6 { table ospf6; export filter { @@ -177,7 +162,6 @@ } protocol kernel kernel_ospf4 { - kernel table 1000; ipv4 { table ospf4; export filter { diff --git a/hosts/nonat/configuration.nix b/hosts/nonat/configuration.nix index 9689255..38ebae5 100644 --- a/hosts/nonat/configuration.nix +++ b/hosts/nonat/configuration.nix @@ -78,20 +78,6 @@ networking.firewall.allowedUDPPorts = [ 50128 51337 ]; - petabyte.policyrouting = { - enable = true; - rules6 = [ - { rule = "from all to fd00:152:152::/48 lookup 1000"; prio = 10000; } # OSPF - { rule = "from fd00:152:152::/48 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to fd00:152:152::/48 unreachable"; prio = 20000; } - ]; - rules4 = [ - { rule = "from all to 10.152.0.0/16 lookup 1000"; prio = 10000; } # OSPF - { rule = "from 10.152.0.0/16 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to 10.152.0.0/16 unreachable"; prio = 20000; } - ]; - }; - services.bird2.enable = true; services.bird2.config = '' router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address }; @@ -120,7 +106,6 @@ } protocol kernel kernel_ospf6 { - kernel table 1000; ipv6 { table ospf6; export filter { @@ -132,7 +117,6 @@ } protocol kernel kernel_ospf4 { - kernel table 1000; ipv4 { table ospf4; export filter { diff --git a/hosts/porter/configuration.nix b/hosts/porter/configuration.nix index 61b0826..1c4910e 100644 --- a/hosts/porter/configuration.nix +++ b/hosts/porter/configuration.nix @@ -66,20 +66,6 @@ networking.firewall.allowedUDPPorts = [ 50138 51337 ]; - petabyte.policyrouting = { - enable = true; - rules6 = [ - { rule = "from all to fd00:152:152::/48 lookup 1000"; prio = 10000; } # OSPF - { rule = "from fd00:152:152::/48 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to fd00:152:152::/48 unreachable"; prio = 20000; } - ]; - rules4 = [ - { rule = "from all to 10.152.0.0/16 lookup 1000"; prio = 10000; } # OSPF - { rule = "from 10.152.0.0/16 lookup 2000"; prio = 10000; } # BGP - { rule = "from all to 10.152.0.0/16 unreachable"; prio = 20000; } - ]; - }; - services.bird2.enable = true; services.bird2.config = '' router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address }; @@ -98,7 +84,6 @@ } protocol kernel kernel_ospf6 { - kernel table 1000; ipv6 { table ospf6; export filter { @@ -110,7 +95,6 @@ } protocol kernel kernel_ospf4 { - kernel table 1000; ipv4 { table ospf4; export filter {