Move test machines configuration to test-machines directory

infra/flake-part.nix

@@ -125,81 +125,7 @@ let
     "fedi201"
   ];
 
-  testMachineConfigurations =
+  testMachineConfigurations = import ./test-machines/configuration.nix;
-    let
-      ## NOTE: All of these secrets are publicly available in this source file
-      ## and will end up in the Nix store. We don't care as they are only ever
-      ## used for testing anyway.
-      mastodonS3KeyConfig =
-        { pkgs, ... }:
-        {
-          s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK3515373e4c851ebaad366558";
-          s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34";
-        };
-      peertubeS3KeyConfig =
-        { pkgs, ... }:
-        {
-          s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK1f9feea9960f6f95ff404c9b";
-          s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7295c4201966a02c2c3d25b5cea4a5ff782966a2415e3a196f91924631191395";
-        };
-      pixelfedS3KeyConfig =
-        { pkgs, ... }:
-        {
-          s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GKb5615457d44214411e673b7b";
-          s3SecretKeyFile = pkgs.writeText "s3SecretKey" "5be6799a88ca9b9d813d1a806b64f15efa49482dbe15339ddfaf7f19cf434987";
-        };
-
-    in
-    {
-      test01 =
-        { pkgs, ... }:
-        {
-          fediversity = {
-            domain = "abundos.eu";
-            garage.enable = true;
-            pixelfed = pixelfedS3KeyConfig { inherit pkgs; };
-            mastodon = mastodonS3KeyConfig { inherit pkgs; };
-            peertube = peertubeS3KeyConfig { inherit pkgs; };
-          };
-        };
-
-      test02 =
-        { pkgs, ... }:
-        {
-          fediversity = {
-            domain = "abundos.eu";
-            mastodon = mastodonS3KeyConfig { inherit pkgs; } // {
-              enable = true;
-            };
-
-            temp.cores = 1; # FIXME: should come from NixOps4 eventually
-          };
-        };
-
-      test03 =
-        { pkgs, ... }:
-        {
-          fediversity = {
-            domain = "abundos.eu";
-            peertube = peertubeS3KeyConfig { inherit pkgs; } // {
-              enable = true;
-              ## NOTE: Only ever used for testing anyway.
-              secretsFile = pkgs.writeText "secret" "574e093907d1157ac0f8e760a6deb1035402003af5763135bae9cbd6abe32b24";
-            };
-          };
-        };
-
-      test04 =
-        { pkgs, ... }:
-        {
-          fediversity = {
-            domain = "abundos.eu";
-            pixelfed = pixelfedS3KeyConfig { inherit pkgs; } // {
-              enable = true;
-            };
-          };
-        };
-    };
 
 in
 {

infra/test-machines/configuration.nix

@@ -0,0 +1,74 @@
+let
+  ## NOTE: All of these secrets are publicly available in this source file
+  ## and will end up in the Nix store. We don't care as they are only ever
+  ## used for testing anyway.
+  mastodonS3KeyConfig =
+    { pkgs, ... }:
+    {
+      s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK3515373e4c851ebaad366558";
+      s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34";
+    };
+  peertubeS3KeyConfig =
+    { pkgs, ... }:
+    {
+      s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK1f9feea9960f6f95ff404c9b";
+      s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7295c4201966a02c2c3d25b5cea4a5ff782966a2415e3a196f91924631191395";
+    };
+  pixelfedS3KeyConfig =
+    { pkgs, ... }:
+    {
+      s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GKb5615457d44214411e673b7b";
+      s3SecretKeyFile = pkgs.writeText "s3SecretKey" "5be6799a88ca9b9d813d1a806b64f15efa49482dbe15339ddfaf7f19cf434987";
+    };
+
+in
+{
+  test01 =
+    { pkgs, ... }:
+    {
+      fediversity = {
+        domain = "abundos.eu";
+        garage.enable = true;
+        pixelfed = pixelfedS3KeyConfig { inherit pkgs; };
+        mastodon = mastodonS3KeyConfig { inherit pkgs; };
+        peertube = peertubeS3KeyConfig { inherit pkgs; };
+      };
+    };
+
+  test02 =
+    { pkgs, ... }:
+    {
+      fediversity = {
+        domain = "abundos.eu";
+        mastodon = mastodonS3KeyConfig { inherit pkgs; } // {
+          enable = true;
+        };
+
+        temp.cores = 1; # FIXME: should come from NixOps4 eventually
+      };
+    };
+
+  test03 =
+    { pkgs, ... }:
+    {
+      fediversity = {
+        domain = "abundos.eu";
+        peertube = peertubeS3KeyConfig { inherit pkgs; } // {
+          enable = true;
+          ## NOTE: Only ever used for testing anyway.
+          secretsFile = pkgs.writeText "secret" "574e093907d1157ac0f8e760a6deb1035402003af5763135bae9cbd6abe32b24";
+        };
+      };
+    };
+
+  test04 =
+    { pkgs, ... }:
+    {
+      fediversity = {
+        domain = "abundos.eu";
+        pixelfed = pixelfedS3KeyConfig { inherit pkgs; } // {
+          enable = true;
+        };
+      };
+    };
+}