From b0ccdfa7da9fa4692e05b2b7b72f49d82d62aa68 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Tue, 1 Apr 2025 13:31:59 +0200 Subject: [PATCH] allow accessing test vms from fedi201's machine ssh key, closes #286 --- infra/flake-part.nix | 2 +- launch/.auto.tfvars.json | 1 + launch/.terraform/modules/modules.json | 1 + launch/.terraform/modules/peertube.deploy | 1 + launch/.terraform/plugin_path | 3 +++ .../registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 | 1 + .../registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 | 1 + launch/terraform.tfstate | 1 + launch/terraform.tfstate.backup | 1 + 9 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 launch/.auto.tfvars.json create mode 100644 launch/.terraform/modules/modules.json create mode 120000 launch/.terraform/modules/peertube.deploy create mode 100644 launch/.terraform/plugin_path create mode 120000 launch/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 create mode 120000 launch/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 create mode 100644 launch/terraform.tfstate create mode 100644 launch/terraform.tfstate.backup diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 56b77e08..1bced36b 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -33,7 +33,7 @@ let { users.users.root.openssh.authorizedKeys.keys = [ # allow our panel vm access to the test machines - (import ../../keys).systems.fedi201 + (import ../keys).systems.fedi201 ]; } ] diff --git a/launch/.auto.tfvars.json b/launch/.auto.tfvars.json new file mode 100644 index 00000000..2e02825a --- /dev/null +++ b/launch/.auto.tfvars.json @@ -0,0 +1 @@ +{"nixos-anywhere": "/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source"} \ No newline at end of file diff --git a/launch/.terraform/modules/modules.json b/launch/.terraform/modules/modules.json new file mode 100644 index 00000000..4bb34087 --- /dev/null +++ b/launch/.terraform/modules/modules.json @@ -0,0 +1 @@ +{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"peertube","Source":"./vm","Dir":"vm"},{"Key":"peertube.deploy","Source":"file:///nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source//terraform/all-in-one","Dir":".terraform/modules/peertube.deploy/terraform/all-in-one"},{"Key":"peertube.deploy.install","Source":"../install","Dir":"/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/install"},{"Key":"peertube.deploy.nixos-rebuild","Source":"../nixos-rebuild","Dir":"/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/nixos-rebuild"},{"Key":"peertube.deploy.partitioner-build","Source":"../nix-build","Dir":"/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/nix-build"},{"Key":"peertube.deploy.system-build","Source":"../nix-build","Dir":"/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/nix-build"}]} \ No newline at end of file diff --git a/launch/.terraform/modules/peertube.deploy b/launch/.terraform/modules/peertube.deploy new file mode 120000 index 00000000..17167407 --- /dev/null +++ b/launch/.terraform/modules/peertube.deploy @@ -0,0 +1 @@ +/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source \ No newline at end of file diff --git a/launch/.terraform/plugin_path b/launch/.terraform/plugin_path new file mode 100644 index 00000000..0a21d939 --- /dev/null +++ b/launch/.terraform/plugin_path @@ -0,0 +1,3 @@ +[ + "/nix/store/mnqkwjg5v6sx86an34b4cn075h0lapz3-opentofu-1.8.7/libexec/terraform-providers" +] \ No newline at end of file diff --git a/launch/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 b/launch/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 new file mode 120000 index 00000000..e74641a1 --- /dev/null +++ b/launch/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 @@ -0,0 +1 @@ +/nix/store/mnqkwjg5v6sx86an34b4cn075h0lapz3-opentofu-1.8.7/libexec/terraform-providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64 \ No newline at end of file diff --git a/launch/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 b/launch/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 new file mode 120000 index 00000000..18952a18 --- /dev/null +++ b/launch/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 @@ -0,0 +1 @@ +/nix/store/mnqkwjg5v6sx86an34b4cn075h0lapz3-opentofu-1.8.7/libexec/terraform-providers/registry.opentofu.org/hashicorp/null/3.2.3/linux_amd64 \ No newline at end of file diff --git a/launch/terraform.tfstate b/launch/terraform.tfstate new file mode 100644 index 00000000..4ef220dd --- /dev/null +++ b/launch/terraform.tfstate @@ -0,0 +1 @@ +{"version":4,"terraform_version":"1.8.5","serial":7,"lineage":"f67dd97a-4f2d-992e-c6e9-02537641a33d","outputs":{},"resources":[{"module":"module.peertube[0].module.deploy.module.install","mode":"managed","type":"null_resource","name":"nixos-remote","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"5018143820106866943","triggers":{"instance_id":"test03"}},"sensitive_attributes":[],"dependencies":["module.peertube.module.deploy.module.partitioner-build.data.external.nix-build","module.peertube.module.deploy.module.system-build.data.external.nix-build"]}]},{"module":"module.peertube[0].module.deploy.module.nixos-rebuild[0]","mode":"managed","type":"null_resource","name":"nixos-rebuild","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"808535584992809102","triggers":{"store_path":"/nix/store/457x8yaxz63543qhfmxfcxnj6r1id6vq-nixos-system-test03-25.05pre711046.8edf06bea5bc"}},"sensitive_attributes":[],"dependencies":["module.peertube.module.deploy.module.install.null_resource.nixos-remote","module.peertube.module.deploy.module.partitioner-build.data.external.nix-build","module.peertube.module.deploy.module.system-build.data.external.nix-build"]}]},{"module":"module.peertube[0].module.deploy.module.partitioner-build","mode":"data","type":"external","name":"nix-build","provider":"provider[\"registry.opentofu.org/hashicorp/external\"]","instances":[{"schema_version":0,"attributes":{"id":"-","program":["/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/nix-build/nix-build.sh"],"query":{"attribute":"config.system.build.diskoScript","file":"vm/../peertube.nix","nix_options":"{\"options\":{\"show-trace\":\"true\"}}","special_args":"{\"terraform\":{\"domain\":\"fediversity.net\",\"hostname\":\"test03\",\"initialUser\":{\"displayName\":\"Testy McTestface\",\"email\":\"test@test.com\",\"password\":\"testtest\",\"username\":\"test\"}}}"},"result":{"out":"/nix/store/snzr17rykalglk914sjmdl7dax4wzxxg-disko"},"working_dir":null},"sensitive_attributes":[]}]},{"module":"module.peertube[0].module.deploy.module.system-build","mode":"data","type":"external","name":"nix-build","provider":"provider[\"registry.opentofu.org/hashicorp/external\"]","instances":[{"schema_version":0,"attributes":{"id":"-","program":["/nix/store/ca7wwzypz3lhvmrb2a1i72pf7d2vh6mw-source/terraform/nix-build/nix-build.sh"],"query":{"attribute":"config.system.build.toplevel","file":"vm/../peertube.nix","nix_options":"{\"options\":{\"show-trace\":\"true\"}}","special_args":"{\"terraform\":{\"domain\":\"fediversity.net\",\"hostname\":\"test03\",\"initialUser\":{\"displayName\":\"Testy McTestface\",\"email\":\"test@test.com\",\"password\":\"testtest\",\"username\":\"test\"}}}"},"result":{"out":"/nix/store/457x8yaxz63543qhfmxfcxnj6r1id6vq-nixos-system-test03-25.05pre711046.8edf06bea5bc"},"working_dir":null},"sensitive_attributes":[]}]}],"check_results":null} diff --git a/launch/terraform.tfstate.backup b/launch/terraform.tfstate.backup new file mode 100644 index 00000000..329a8e50 --- /dev/null +++ b/launch/terraform.tfstate.backup @@ -0,0 +1 @@ +{"version":4,"terraform_version":"1.8.5","serial":6,"lineage":"f67dd97a-4f2d-992e-c6e9-02537641a33d","outputs":{},"resources":[{"module":"module.peertube[0].module.deploy.module.install","mode":"managed","type":"null_resource","name":"nixos-remote","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"5018143820106866943","triggers":{"instance_id":"test03"}},"sensitive_attributes":[],"dependencies":["module.peertube.module.deploy.module.partitioner-build.data.external.nix-build","module.peertube.module.deploy.module.system-build.data.external.nix-build"]}]},{"module":"module.peertube[0].module.deploy.module.nixos-rebuild[0]","mode":"managed","type":"null_resource","name":"nixos-rebuild","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"808535584992809102","triggers":{"store_path":"/nix/store/457x8yaxz63543qhfmxfcxnj6r1id6vq-nixos-system-test03-25.05pre711046.8edf06bea5bc"}},"sensitive_attributes":[],"dependencies":["module.peertube.module.deploy.module.install.null_resource.nixos-remote","module.peertube.module.deploy.module.partitioner-build.data.external.nix-build","module.peertube.module.deploy.module.system-build.data.external.nix-build"]}]},{"module":"module.peertube[0].module.deploy.module.partitioner-build","mode":"data","type":"external","name":"nix-build","provider":"provider[\"registry.opentofu.org/hashicorp/external\"]","instances":[{"schema_version":0,"attributes":{"id":"-","program":["/nix/store/q68mw6lmjjhrvcrhb0pcm9i0v6m3v7cn-source/terraform/nix-build/nix-build.sh"],"query":{"attribute":"config.system.build.diskoScript","file":"vm/../peertube.nix","nix_options":"{\"options\":{\"show-trace\":\"true\"}}","special_args":"{\"terraform\":{\"domain\":\"fediversity.net\",\"hostname\":\"test03\",\"initialUser\":{\"displayName\":\"Testy McTestface\",\"email\":\"test@test.com\",\"password\":\"testtest\",\"username\":\"test\"}}}"},"result":{"out":"/nix/store/snzr17rykalglk914sjmdl7dax4wzxxg-disko"},"working_dir":null},"sensitive_attributes":[]}]},{"module":"module.peertube[0].module.deploy.module.system-build","mode":"data","type":"external","name":"nix-build","provider":"provider[\"registry.opentofu.org/hashicorp/external\"]","instances":[{"schema_version":0,"attributes":{"id":"-","program":["/nix/store/q68mw6lmjjhrvcrhb0pcm9i0v6m3v7cn-source/terraform/nix-build/nix-build.sh"],"query":{"attribute":"config.system.build.toplevel","file":"vm/../peertube.nix","nix_options":"{\"options\":{\"show-trace\":\"true\"}}","special_args":"{\"terraform\":{\"domain\":\"fediversity.net\",\"hostname\":\"test03\",\"initialUser\":{\"displayName\":\"Testy McTestface\",\"email\":\"test@test.com\",\"password\":\"testtest\",\"username\":\"test\"}}}"},"result":{"out":"/nix/store/457x8yaxz63543qhfmxfcxnj6r1id6vq-nixos-system-test03-25.05pre711046.8edf06bea5bc"},"working_dir":null},"sensitive_attributes":[]}]}],"check_results":null}