diff --git a/infra/flake-part.nix b/infra/flake-part.nix index fac98ee6..7e05a811 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -107,6 +107,13 @@ let kiara = [ "fedi201" ]; + test = [ + "test01" + "test02" + "test03" + "test04" + "test05" + ]; }; in diff --git a/infra/test01/default.nix b/infra/test01/default.nix new file mode 100644 index 00000000..434d7ea5 --- /dev/null +++ b/infra/test01/default.nix @@ -0,0 +1,19 @@ +{ + fediversityVm = { + vmId = 7001; + proxmox = "fediversity"; + + hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub; + unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key; + + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.51"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::51"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/deployment/hostKeys/provisioning.fedi010/ssh_host_ed25519_key b/infra/test01/ssh_host_ed25519_key similarity index 100% rename from deployment/hostKeys/provisioning.fedi010/ssh_host_ed25519_key rename to infra/test01/ssh_host_ed25519_key diff --git a/deployment/hostKeys/provisioning.fedi010/ssh_host_ed25519_key.pub b/infra/test01/ssh_host_ed25519_key.pub similarity index 100% rename from deployment/hostKeys/provisioning.fedi010/ssh_host_ed25519_key.pub rename to infra/test01/ssh_host_ed25519_key.pub diff --git a/infra/test02/default.nix b/infra/test02/default.nix new file mode 100644 index 00000000..a800de18 --- /dev/null +++ b/infra/test02/default.nix @@ -0,0 +1,19 @@ +{ + fediversityVm = { + vmId = 7002; + proxmox = "fediversity"; + + hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub; + unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key; + + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.52"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::52"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/deployment/hostKeys/provisioning.fedi011/ssh_host_ed25519_key b/infra/test02/ssh_host_ed25519_key similarity index 100% rename from deployment/hostKeys/provisioning.fedi011/ssh_host_ed25519_key rename to infra/test02/ssh_host_ed25519_key diff --git a/deployment/hostKeys/provisioning.fedi011/ssh_host_ed25519_key.pub b/infra/test02/ssh_host_ed25519_key.pub similarity index 100% rename from deployment/hostKeys/provisioning.fedi011/ssh_host_ed25519_key.pub rename to infra/test02/ssh_host_ed25519_key.pub diff --git a/infra/test03/default.nix b/infra/test03/default.nix new file mode 100644 index 00000000..e6a31c87 --- /dev/null +++ b/infra/test03/default.nix @@ -0,0 +1,19 @@ +{ + fediversityVm = { + vmId = 7003; + proxmox = "fediversity"; + + hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub; + unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key; + + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.53"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::53"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/deployment/hostKeys/provisioning.fedi012/ssh_host_ed25519_key b/infra/test03/ssh_host_ed25519_key similarity index 100% rename from deployment/hostKeys/provisioning.fedi012/ssh_host_ed25519_key rename to infra/test03/ssh_host_ed25519_key diff --git a/deployment/hostKeys/provisioning.fedi012/ssh_host_ed25519_key.pub b/infra/test03/ssh_host_ed25519_key.pub similarity index 100% rename from deployment/hostKeys/provisioning.fedi012/ssh_host_ed25519_key.pub rename to infra/test03/ssh_host_ed25519_key.pub diff --git a/infra/test04/default.nix b/infra/test04/default.nix new file mode 100644 index 00000000..e7c3b991 --- /dev/null +++ b/infra/test04/default.nix @@ -0,0 +1,19 @@ +{ + fediversityVm = { + vmId = 7004; + proxmox = "fediversity"; + + hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub; + unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key; + + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.54"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::54"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/deployment/hostKeys/provisioning.fedi013/ssh_host_ed25519_key b/infra/test04/ssh_host_ed25519_key similarity index 100% rename from deployment/hostKeys/provisioning.fedi013/ssh_host_ed25519_key rename to infra/test04/ssh_host_ed25519_key diff --git a/deployment/hostKeys/provisioning.fedi013/ssh_host_ed25519_key.pub b/infra/test04/ssh_host_ed25519_key.pub similarity index 100% rename from deployment/hostKeys/provisioning.fedi013/ssh_host_ed25519_key.pub rename to infra/test04/ssh_host_ed25519_key.pub diff --git a/infra/test05/default.nix b/infra/test05/default.nix new file mode 100644 index 00000000..8b6de173 --- /dev/null +++ b/infra/test05/default.nix @@ -0,0 +1,19 @@ +{ + fediversityVm = { + vmId = 7005; + proxmox = "fediversity"; + + hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub; + unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key; + + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.55"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::55"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/deployment/hostKeys/provisioning.fedi014/ssh_host_ed25519_key b/infra/test05/ssh_host_ed25519_key similarity index 100% rename from deployment/hostKeys/provisioning.fedi014/ssh_host_ed25519_key rename to infra/test05/ssh_host_ed25519_key diff --git a/deployment/hostKeys/provisioning.fedi014/ssh_host_ed25519_key.pub b/infra/test05/ssh_host_ed25519_key.pub similarity index 100% rename from deployment/hostKeys/provisioning.fedi014/ssh_host_ed25519_key.pub rename to infra/test05/ssh_host_ed25519_key.pub