From be37cdda43445bd3b1e39b22f82258e4b176d41f Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Mon, 12 May 2025 14:21:50 +0200
Subject: [PATCH] got thru download errors kinda

---
 deployment/check/basic/basic.tfvars  | 46 ++++++++++++++--------------
 deployment/check/basic/nixosTest.nix | 38 +++++++++++++++++++++--
 launch/main.tf                       |  3 +-
 3 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/deployment/check/basic/basic.tfvars b/deployment/check/basic/basic.tfvars
index c9194678..cda05cda 100644
--- a/deployment/check/basic/basic.tfvars
+++ b/deployment/check/basic/basic.tfvars
@@ -20,26 +20,26 @@ garage = {
     }
   EOF
 }
-mastodon = {
-  enable = true
-  target = "target"
-  nix_module = <<-EOF
-    {
-      fediversityVm = {
-        # vmId = 7014;
-        proxmox = "fediversity";
-        # hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
-        # unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
-        domain = "test.example";
-        ipv4 = {
-          address = "";
-          gateway = "";
-        };
-        ipv6 = {
-          address = "";
-          gateway = "";
-        };
-      };
-    }
-  EOF
-}
+# mastodon = {
+#   enable = true
+#   target = "target"
+#   nix_module = <<-EOF
+#     {
+#       fediversityVm = {
+#         # vmId = 7014;
+#         proxmox = "fediversity";
+#         # hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
+#         # unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
+#         domain = "test.example";
+#         ipv4 = {
+#           address = "";
+#           gateway = "";
+#         };
+#         ipv6 = {
+#           address = "";
+#           gateway = "";
+#         };
+#       };
+#     }
+#   EOF
+# }
diff --git a/deployment/check/basic/nixosTest.nix b/deployment/check/basic/nixosTest.nix
index 69dec038..40d8f286 100644
--- a/deployment/check/basic/nixosTest.nix
+++ b/deployment/check/basic/nixosTest.nix
@@ -27,8 +27,9 @@ testers.runNixOSTest (
       ../../../launch/shared.nix
       ../../../launch/garage.nix
       ../../../launch/mastodon.nix
-      ../../../launch/pixelfed.nix
-      ../../../launch/peertube.nix
+      # prevent issue about multiple services on same nginx port: Segmentation fault      (core dumped) gixy $out; This can be caused by combining multiple incompatible services on the same hostname.
+      # ../../../launch/pixelfed.nix
+      # ../../../launch/peertube.nix
       ../../../infra/test-machines/test01
       {
         nix.nixPath = [ "/dummy/nix/path" ];
@@ -59,10 +60,25 @@ testers.runNixOSTest (
         machine.system.path.inputDerivation
         machine.system.build.setEnvironment.inputDerivation
         machine.system.build.vm.inputDerivation
-        # machine.system.build.vmWithBootLoader.inputDerivation
+        # machine.system.build.vmWithBootLoader.inputDerivation # The option `nodes.hello.virtualisation.vmVariantWithBootLoader._module.args.name' is defined multiple times while it's expected to be unique.
         machine.system.build.bootStage1.inputDerivation
         machine.system.build.bootStage2.inputDerivation
+        machine.system.modulesTree.inputDerivation
+        machine.system.build.binsh.inputDerivation
+        machine.system.build.initialRamdisk.inputDerivation
+        machine.system.build.initialRamdiskSecretAppender.inputDerivation
+        machine.system.build.installBootLoader.inputDerivation
+        machine.system.build.kernel.inputDerivation
+        machine.system.build.nixos-enter.inputDerivation
+        machine.system.build.nixos-generate-config.inputDerivation
+        machine.system.build.nixos-install.inputDerivation
+        machine.system.build.nixos-option.inputDerivation
+        machine.system.build.nixos-rebuild.inputDerivation
+        machine.system.build.separateActivationScript.inputDerivation
+        machine.system.build.uki.inputDerivation
+        # machine.system.outPath
       ]
+      ++ machine.environment.systemPackages
       ++ lib.concatLists (
         lib.mapAttrsToList (
           _k: v: if v ? source.inputDerivation then [ v.source.inputDerivation ] else [ ]
@@ -143,6 +159,22 @@ testers.runNixOSTest (
                 pkgs.musl.inputDerivation
                 pkgs.w3m # why in the world?!
                 pkgs.w3m.inputDerivation
+                pkgs.byacc
+                pkgs.byacc.inputDerivation
+                pkgs.openssh
+                pkgs.openssh.inputDerivation
+                pkgs.curl
+                pkgs.curl.inputDerivation
+                # pkgs.coreutils
+                pkgs.coreutils.inputDerivation
+                pkgs.krb5
+                pkgs.krb5.inputDerivation
+                pkgs.libssh2
+                pkgs.libssh2.inputDerivation
+                pkgs.nghttp2
+                pkgs.nghttp2.inputDerivation
+                pkgs.openssl
+                pkgs.openssl.inputDerivation
               ]
               ++ lib.concatLists (
                 map extraDependenciesFromMachine (map (tm: nodes.${tm}) targetMachines ++ [ fakeMachine.config ])
diff --git a/launch/main.tf b/launch/main.tf
index dafc04d2..5be383a0 100644
--- a/launch/main.tf
+++ b/launch/main.tf
@@ -16,7 +16,8 @@ locals {
     garage = var.garage
   } : name => merge(inst, {
     # enable if any user applications are enabled
-    enable = anytrue([for _, app in local.application_configs: try(app.enable, false)])
+    enable = true
+    # enable = anytrue([for _, app in local.application_configs: try(app.enable, false)])
   }) }
 }