diff --git a/hosts/dn42-il-gw1/configuration.nix b/hosts/dn42-il-gw1/configuration.nix index 1665ec5..2089522 100644 --- a/hosts/dn42-il-gw1/configuration.nix +++ b/hosts/dn42-il-gw1/configuration.nix @@ -183,6 +183,26 @@ ]; privateKeyFile = config.sops.secrets.wg1280.path; }; + # zaphyra + wg1718 = { + ips = [ + "fe80::2574/128" + # peer fe80::6b61/64 + ]; + postSetup = '' + ip addr replace dev wg1718 fe80::2574/128 peer fe80::6b61/128 + ''; + listenPort = 51718; + allowedIPsAsRoutes = false; + peers = [ + { + allowedIPs = [ "fe80::/10" "fd00::/8" ]; + endpoint = "router-a.dn42.zaphyra.eu:51831"; + publicKey = "Knm6uEpMsTfZAK68Pl98mHORtb8TtswBfYFGznpHUCI="; + } + ]; + privateKeyFile = config.sops.secrets.wg1718.path; + }; # iedon # https://iedon.net/ wg2189 = { @@ -223,26 +243,6 @@ ]; privateKeyFile = config.sops.secrets.wg4719.path; }; - # zaphyra - wg1718 = { - ips = [ - "fe80::2574/128" - # peer fe80::6b61/64 - ]; - postSetup = '' - ip addr replace dev wg1718 fe80::2574/128 peer fe80::6b61/128 - ''; - listenPort = 51718; - allowedIPsAsRoutes = false; - peers = [ - { - allowedIPs = [ "fe80::/10" "fd00::/8" ]; - endpoint = "router-a.dn42.zaphyra.eu:51831"; - publicKey = "Knm6uEpMsTfZAK68Pl98mHORtb8TtswBfYFGznpHUCI="; - } - ]; - privateKeyFile = config.sops.secrets.wg1718.path; - }; # tbspace wg6190 = { ips = [ @@ -273,9 +273,9 @@ 51271 # wg1271 51272 # wg1272 51280 # wg1280 + 51718 # wg1718 52189 # wg2189 54719 # wg4719 - 51718 # wg1718 56190 # wg6190 ]; @@ -349,6 +349,13 @@ remoteAsn = "4242421280"; localAddress = "fde3:4c0d:2836:ff00::21"; } + { + peerName = "peer_1718"; + remoteAddress = "fe80::6b61"; + interfaceName = "wg1718"; + remoteAsn = "4242421718"; + localAddress = "fe80::2574"; + } { peerName = "peer_2189_de_fra"; remoteAddress = "fe80::2189:e9"; @@ -363,13 +370,6 @@ remoteAsn = "64719"; localAddress = "fe80::1"; } - { - peerName = "peer_1718"; - remoteAddress = "fe80::6b61"; - interfaceName = "wg1718"; - remoteAsn = "4242421718"; - localAddress = "fe80::2574"; - } { peerName = "peer_6190"; remoteAddress = "fe80::1299:e";