From 0f8972a8f0ab8079900d44bebdc2e0e3f2956d7c Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer.bar-yam@moduscreate.com>
Date: Thu, 18 Jul 2024 08:22:47 -0400
Subject: [PATCH] for now, we have to stop using vmVariant so the test works

---
 README.md  |  2 ++
 garage.nix | 30 ++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1a3e805..d85e960 100644
--- a/README.md
+++ b/README.md
@@ -84,4 +84,6 @@ When mastodon is running in production mode, we have a few problems:
 - mastodon is trying to fetch `missing.png` without ssl (`http://`). This isn't allowed, and i'm not sure why it's doing it.
 - mastodon is trying to fetch `custom.css` from https://mastodon.localhost (no port), which is not the configured `LOCAL_DOMAIN`, so it's unclear why.
 
+NixOS tests do not take the configuration from `virtualisation.vmVariant`. This seems like an oversight since people don't tend to mix normal NixOS configurations with the ones they're using for tests. This should be pretty easy to rectify upstream.
+
 
diff --git a/garage.nix b/garage.nix
index 3de3709..ff2ec36 100644
--- a/garage.nix
+++ b/garage.nix
@@ -125,23 +125,21 @@ in {
   };
 
   config = {
-    virtualisation.vmVariant = { config, ... }: {
-      virtualisation.diskSize = 2048;
-      virtualisation.forwardPorts = [
-        {
-          from = "host";
-          host.port = 3901;
-          guest.port = 3901;
-        }
-        {
-          from = "host";
-          host.port = 3902;
-          guest.port = 3902;
-        }
-      ];
+    virtualisation.diskSize = 2048;
+    virtualisation.forwardPorts = [
+      {
+        from = "host";
+        host.port = 3901;
+        guest.port = 3901;
+      }
+      {
+        from = "host";
+        host.port = 3902;
+        guest.port = 3902;
+      }
+    ];
 
-      environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
-    };
+    environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
 
     networking.firewall.allowedTCPPorts = [ 3901 3902 ];
     services.garage = {