diff --git a/REGISTRY.md b/REGISTRY.md index 04d788a..1432300 100644 --- a/REGISTRY.md +++ b/REGISTRY.md @@ -3,13 +3,13 @@ ## HE On a un `/64` uniquement routé via un tunnel 6in4: - - IP de lien local: `2001:470:1f12:187::2/64` - - IP de lien Remote: `2001:470:1f12:187::1/64` + - IP de lien local: `2001:470:1f12:2b::2/64` + - IP de lien Remote: `2001:470:1f12:2b::1/64` - Endpoint ipv4: `216.66.84.42`/`129.199.146.230` | Préfixe | Attribution | |-|-| -| `2001:470:1f13:187::/64` | he-dmz, vlan 2530 | +| `2001:470:1f13:2b::/64` | he-dmz, vlan 2530 | ## MWAN diff --git a/machines/router02/_hardware-configuration.nix b/machines/router02/_hardware-configuration.nix index 3214702..4920a10 100644 --- a/machines/router02/_hardware-configuration.nix +++ b/machines/router02/_hardware-configuration.nix @@ -42,7 +42,7 @@ # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; + # networking.useDHCP = lib.mkDefault true; # networking.interfaces.ens18.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/machines/router02/networking.nix b/machines/router02/networking.nix index 3979c07..3bc2d79 100644 --- a/machines/router02/networking.nix +++ b/machines/router02/networking.nix @@ -10,7 +10,10 @@ networkConfig = { Description = "ENS uplink"; - Address = [ "129.199.146.230/24" ]; + Address = [ + "129.199.146.231/24" + "129.199.146.230/24" + ]; Gateway = "129.199.146.254"; LLDP = true; # Only to the switch we are connected to directly, e.g. the hypervisor or the switch. @@ -34,8 +37,8 @@ "50-tun-he" = { name = "sit-he"; networkConfig = { - Description = "HE.NET IPv6 Tunnel (gdd)"; - Address = [ "2001:470:1f12:187::2/64" ]; + Description = "HE.NET IPv6 Tunnel (maurice)"; + Address = [ "2001:470:1f12:2b::2/64" ]; ConfigureWithoutCarrier = true; }; routes = [ @@ -53,13 +56,13 @@ routingPolicyRules = [ { routingPolicyRuleConfig = { - From = "2001:470:1f13:187::/64"; + From = "2001:470:1f13:2b::/64"; Table = "he"; }; } { routingPolicyRuleConfig = { - To = "2001:470:1f13:187::/64"; + To = "2001:470:1f13:2b::/64"; Table = "he"; }; } @@ -160,13 +163,13 @@ name = "vlan-he-dmz"; networkConfig = { Description = "HE DMZ VLAN"; - Address = [ "2001:470:1f13:187::1/64" ]; + Address = [ "2001:470:1f13:2b::1/64" ]; IPv6SendRA = "yes"; }; ipv6Prefixes = [ { ipv6PrefixConfig = { - Prefix = "2001:470:1f13:187::0/64"; + Prefix = "2001:470:1f13:2b::0/64"; }; } ]; @@ -174,7 +177,7 @@ { Table = "he"; Scope = "global"; - Destination = "2001:470:1f13:187::/64"; + Destination = "2001:470:1f13:2b::/64"; } ]; }; @@ -186,7 +189,7 @@ Name = "sit-he"; }; tunnelConfig = { - Local = "129.199.146.230"; + Local = "129.199.146.231"; Remote = "216.66.84.42"; }; };