DGNum/lab-infra
8
1
Fork 1
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat(router02/sit): Use new tunnel
All checks were successful
lint / check (push) Successful in 23s
Details
build configuration / build_krz01 (push) Successful in 2h37m6s
Details

Browse source
This commit is contained in:
sinavir 2024-12-21 12:56:46 +01:00
parent 9daab9a609
commit 1f28d0ccbf
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
REGISTRY.md
View file

@ -3,13 +3,13 @@
## HE ## HE
On a un `/64` uniquement routé via un tunnel 6in4: On a un `/64` uniquement routé via un tunnel 6in4:
- IP de lien local: `2001:470:1f12:187::2/64` - IP de lien local: `2001:470:1f12:2b::2/64`
- IP de lien Remote: `2001:470:1f12:187::1/64` - IP de lien Remote: `2001:470:1f12:2b::1/64`
- Endpoint ipv4: `216.66.84.42`/`129.199.146.230` - Endpoint ipv4: `216.66.84.42`/`129.199.146.230`
| Préfixe | Attribution | | Préfixe | Attribution |
|-|-| |-|-|
| `2001:470:1f13:187::/64` | he-dmz, vlan 2530 | | `2001:470:1f13:2b::/64` | he-dmz, vlan 2530 |
## MWAN ## MWAN

2
machines/router02/_hardware-configuration.nix
View file

@ -42,7 +42,7 @@
# (the default) this is the recommended approach. When using systemd-networkd it's # (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 # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; # networking.useDHCP = lib.mkDefault true;
# networking.interfaces.ens18.useDHCP = lib.mkDefault true; # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

21
machines/router02/networking.nix
View file

@ -10,7 +10,10 @@
networkConfig = { networkConfig = {
Description = "ENS uplink"; 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"; Gateway = "129.199.146.254";
LLDP = true; LLDP = true;
# Only to the switch we are connected to directly, e.g. the hypervisor or the switch. # Only to the switch we are connected to directly, e.g. the hypervisor or the switch.
@ -34,8 +37,8 @@
"50-tun-he" = { "50-tun-he" = {
name = "sit-he"; name = "sit-he";
networkConfig = { networkConfig = {
Description = "HE.NET IPv6 Tunnel (gdd)"; Description = "HE.NET IPv6 Tunnel (maurice)";
Address = [ "2001:470:1f12:187::2/64" ]; Address = [ "2001:470:1f12:2b::2/64" ];
ConfigureWithoutCarrier = true; ConfigureWithoutCarrier = true;
}; };
routes = [ routes = [
@ -53,13 +56,13 @@
routingPolicyRules = [ routingPolicyRules = [
{ {
routingPolicyRuleConfig = { routingPolicyRuleConfig = {
From = "2001:470:1f13:187::/64"; From = "2001:470:1f13:2b::/64";
Table = "he"; Table = "he";
}; };
} }
{ {
routingPolicyRuleConfig = { routingPolicyRuleConfig = {
To = "2001:470:1f13:187::/64"; To = "2001:470:1f13:2b::/64";
Table = "he"; Table = "he";
}; };
} }
@ -160,13 +163,13 @@
name = "vlan-he-dmz"; name = "vlan-he-dmz";
networkConfig = { networkConfig = {
Description = "HE DMZ VLAN"; Description = "HE DMZ VLAN";
Address = [ "2001:470:1f13:187::1/64" ]; Address = [ "2001:470:1f13:2b::1/64" ];
IPv6SendRA = "yes"; IPv6SendRA = "yes";
}; };
ipv6Prefixes = [ ipv6Prefixes = [
{ {
ipv6PrefixConfig = { ipv6PrefixConfig = {
Prefix = "2001:470:1f13:187::0/64"; Prefix = "2001:470:1f13:2b::0/64";
}; };
} }
]; ];
@ -174,7 +177,7 @@
{ {
Table = "he"; Table = "he";
Scope = "global"; Scope = "global";
Destination = "2001:470:1f13:187::/64"; Destination = "2001:470:1f13:2b::/64";
} }
]; ];
}; };
@ -186,7 +189,7 @@
Name = "sit-he"; Name = "sit-he";
}; };
tunnelConfig = { tunnelConfig = {
Local = "129.199.146.230"; Local = "129.199.146.231";
Remote = "216.66.84.42"; Remote = "216.66.84.42";
}; };
}; };