diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix index e325e25..1d27ac4 100644 --- a/tests/infrastructure/default.nix +++ b/tests/infrastructure/default.nix @@ -21,13 +21,10 @@ }; }; - custom = { - networking.overlay.networkCidr = lib.mkForce "10.10.10.0/24"; - services.nebula = { - caCertificatePath = ./keys/ca.crt; - certificatePath = ./keys/${config.networking.hostName}.crt; - privateKeyPath = ./keys/${config.networking.hostName}.key; - }; + custom.services.nebula = { + caCertificatePath = ./keys/ca.crt; + certificatePath = ./keys/${config.networking.hostName}.crt; + privateKeyPath = ./keys/${config.networking.hostName}.key; }; services.resolved.dnssec = lib.mkForce "false"; @@ -40,7 +37,7 @@ custom = { networking = { overlay = { - address = "10.10.10.1"; + address = "10.254.250.1"; isLighthouse = true; role = "server"; }; @@ -59,7 +56,7 @@ custom = { networking = { overlay = { - address = "10.10.10.2"; + address = "10.254.250.2"; role = "server"; }; underlay = { @@ -82,7 +79,7 @@ client = { custom.networking = { overlay = { - address = "10.10.10.3"; + address = "10.254.250.3"; role = "client"; }; underlay = { diff --git a/tests/infrastructure/keys/client.crt b/tests/infrastructure/keys/client.crt index 008e6f1..d0fbf6e 100644 --- a/tests/infrastructure/keys/client.crt +++ b/tests/infrastructure/keys/client.crt @@ -1,6 +1,6 @@ -----BEGIN NEBULA CERTIFICATE V2----- -MIGwoEqABmNsaWVudKEHBAUKCgoDGKMIDAZjbGllbnSFBGmPLfCGBQElh0qDhyA8 -ckeBMU2fPOMFe8cEQoAZW3a1/xd+hPuJgkRptJYkIIIg+h9fWh7oVaJEMJmmfCcC -zmFUQuPen59PiEE0+AKBbCyDQAIqxF7cIf5fL+z3zimUASA4hB5qFUCGEH+Er/Z6 -vFXe0jHV4HYRBMaXgrM8JYnsGZgTtdyt+mlJR+uBWpH+pwg= +MIGwoEqABmNsaWVudKEHBAUK/voDGKMIDAZjbGllbnSFBGmTH3CGBQElh0qDhyA8 +ckeBMU2fPOMFe8cEQoAZW3a1/xd+hPuJgkRptJYkIIIgkqGANOljLGTOy02go6Sb +5QuDE12UT7NScZq8xd/6N0SDQCerRL9iT4lQY18Jx6Ov0vYnCgDpi9md7HfaeW7J +6liZCxssEzBf6NtISsFHVBhv/GKMzHTLSFuC3JKF80SByw4= -----END NEBULA CERTIFICATE V2----- diff --git a/tests/infrastructure/keys/client.key b/tests/infrastructure/keys/client.key index 978cb32..fd45d9a 100644 --- a/tests/infrastructure/keys/client.key +++ b/tests/infrastructure/keys/client.key @@ -1,3 +1,3 @@ -----BEGIN NEBULA X25519 PRIVATE KEY----- -qURs9kzi3rsW8GLnOtzEV11M9TWs+0XSQxpEFN9Ab1Y= +C6+KrKj/MfoupP/yt5CKLjDqFmFcGlN9Hb3gCaz8uy8= -----END NEBULA X25519 PRIVATE KEY----- diff --git a/tests/infrastructure/keys/lighthouse.crt b/tests/infrastructure/keys/lighthouse.crt index cae3a07..50789a2 100644 --- a/tests/infrastructure/keys/lighthouse.crt +++ b/tests/infrastructure/keys/lighthouse.crt @@ -1,6 +1,6 @@ -----BEGIN NEBULA CERTIFICATE V2----- -MIG0oE6ACmxpZ2h0aG91c2WhBwQFCgoKARijCAwGc2VydmVyhQRpjy1MhgUBJYdK -g4cgPHJHgTFNnzzjBXvHBEKAGVt2tf8XfoT7iYJEabSWJCCCIOfG1wz7tFj9GCvc -nth3Wm4oGYfK/iR7hbSXts8uAOwhg0DRuHJ6mGgi2deJIDz7aI6KmhMiWkdEnoxA -X8Eo5lZ4iIqyIiC8yAwYOMK1yHOVbfMplsUmhPgLw8Fu7wxSaiML +MIG0oE6ACmxpZ2h0aG91c2WhBwQFCv76ARijCAwGc2VydmVyhQRpkx+UhgUBJYdK +g4cgPHJHgTFNnzzjBXvHBEKAGVt2tf8XfoT7iYJEabSWJCCCICWnesCSyPXq2G/y +J6Gf8Ul8H380b87GOD6nmhjq0q41g0BD5XmYzKqP3ISC0u9/xjgH3CjD0mHTRriD +nOgSkJoWoBTqg6LfNzDR6a/c9stLZanqfGLm6e2/EQgoxEWI0twE -----END NEBULA CERTIFICATE V2----- diff --git a/tests/infrastructure/keys/lighthouse.key b/tests/infrastructure/keys/lighthouse.key index 49c7fe2..55ab863 100644 --- a/tests/infrastructure/keys/lighthouse.key +++ b/tests/infrastructure/keys/lighthouse.key @@ -1,3 +1,3 @@ -----BEGIN NEBULA X25519 PRIVATE KEY----- -fR7KPdR2nDOZtR/gEI+qwKQXI9JSAdi/j7PjYTAJShE= +87z9BoiuyOIrKBUzLslX93dNJWq38gIbSJciSEUQsiM= -----END NEBULA X25519 PRIVATE KEY----- diff --git a/tests/infrastructure/keys/server.crt b/tests/infrastructure/keys/server.crt index aad9f69..681d659 100644 --- a/tests/infrastructure/keys/server.crt +++ b/tests/infrastructure/keys/server.crt @@ -1,6 +1,6 @@ -----BEGIN NEBULA CERTIFICATE V2----- -MIGwoEqABnNlcnZlcqEHBAUKCgoCGKMIDAZzZXJ2ZXKFBGmPLYyGBQElh0qDhyA8 -ckeBMU2fPOMFe8cEQoAZW3a1/xd+hPuJgkRptJYkIIIgWaZqtu8FVy/2REaZAVFo -BIOUaKrBSyrZuiLcBcFneR+DQOlv7S1H9Elhzl/8IhCCpiyamhkm4SL0eYV1N+S9 -lAsj3ga9dga/N5QqNZtWUs8RGgPzttNF8GOy0Evf10lZKwY= +MIGwoEqABnNlcnZlcqEHBAUK/voCGKMIDAZzZXJ2ZXKFBGmTH0GGBQElh0qDhyA8 +ckeBMU2fPOMFe8cEQoAZW3a1/xd+hPuJgkRptJYkIIIghcIHfvMJd45kvlvzqnyU +INvf22cE/ClUtVRCnUn2Bm+DQB7IemcArOhjJUg9iY5hsfsCmrQe8I8uGAcm4GXu +MHw5Rpz5Sfv4mfozWEGJ8qnQDuYKk3Rc0C6BUW+hLrJZ9QM= -----END NEBULA CERTIFICATE V2----- diff --git a/tests/infrastructure/keys/server.key b/tests/infrastructure/keys/server.key index 517eb56..60e6cb9 100644 --- a/tests/infrastructure/keys/server.key +++ b/tests/infrastructure/keys/server.key @@ -1,3 +1,3 @@ -----BEGIN NEBULA X25519 PRIVATE KEY----- -ug2E1t5D3hFNSwivf+sz0S9Xb4k44F0WM0lYyfw3X8I= +LO3MF3zX4em6yerztMmYalkNs5fFgoDbecAoIkSYntU= -----END NEBULA X25519 PRIVATE KEY-----