From e25ff108728ee22040626974c969fa4b40f5eef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
<nicolas.jeannerod@moduscreate.com>
Date: Thu, 27 Mar 2025 15:48:35 +0100
Subject: [PATCH] Work around weird Proxmox behaviour with test02 (#282)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/282
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
---
infra/flake-part.nix | 2 +-
infra/test-machines/test06/default.nix | 19 +++++++++++++++++++
.../test-machines/test06/ssh_host_ed25519_key | 7 +++++++
.../test06/ssh_host_ed25519_key.pub | 1 +
4 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 infra/test-machines/test06/default.nix
create mode 100644 infra/test-machines/test06/ssh_host_ed25519_key
create mode 100644 infra/test-machines/test06/ssh_host_ed25519_key.pub
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index f90bd2ff..6a69278e 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -65,7 +65,7 @@ let
isTestVm = true;
};
mastodonConfigurationResource = makeResourceModule {
- vmName = "test02";
+ vmName = "test06"; # somehow `test02` has a problem - use test06 instead
isTestVm = true;
};
peertubeConfigurationResource = makeResourceModule {
diff --git a/infra/test-machines/test06/default.nix b/infra/test-machines/test06/default.nix
new file mode 100644
index 00000000..f23a83f8
--- /dev/null
+++ b/infra/test-machines/test06/default.nix
@@ -0,0 +1,19 @@
+{
+ fediversityVm = {
+ vmId = 7006;
+ 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.56";
+ gateway = "95.215.187.1";
+ };
+ ipv6 = {
+ address = "2a00:51c0:13:1305::56";
+ gateway = "2a00:51c0:13:1305::1";
+ };
+ };
+}
diff --git a/infra/test-machines/test06/ssh_host_ed25519_key b/infra/test-machines/test06/ssh_host_ed25519_key
new file mode 100644
index 00000000..b2a9b2f1
--- /dev/null
+++ b/infra/test-machines/test06/ssh_host_ed25519_key
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACC9tVetM5x9PPgc6quVSq8Hk6bJ0VzO9hB7n470pSlhTwAAAIh7l3X0e5d1
+9AAAAAtzc2gtZWQyNTUxOQAAACC9tVetM5x9PPgc6quVSq8Hk6bJ0VzO9hB7n470pSlhTw
+AAAEBu+g3q61og0mJ+mHv0oBaQXuJO4BOGcpR3p0UI8sdeyr21V60znH08+Bzqq5VKrweT
+psnRXM72EHufjvSlKWFPAAAAAAECAwQF
+-----END OPENSSH PRIVATE KEY-----
diff --git a/infra/test-machines/test06/ssh_host_ed25519_key.pub b/infra/test-machines/test06/ssh_host_ed25519_key.pub
new file mode 100644
index 00000000..85c81031
--- /dev/null
+++ b/infra/test-machines/test06/ssh_host_ed25519_key.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL21V60znH08+Bzqq5VKrweTpsnRXM72EHufjvSlKWFP