Chore:_migrate 'machineName' to 'settings.machine.name'

checks/borgbackup/default.nix

@@ -16,7 +16,7 @@
             };
           }
           {
-            clan.core.machineName = "machine";
+            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
             clan.core.state.testState.folders = [ "/etc/state" ];
             environment.etc.state.text = "hello world";

checks/deltachat/default.nix

@@ -10,7 +10,7 @@
           self.clanModules.deltachat
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "machine";
+            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];

checks/matrix-synapse/default.nix

@@ -15,7 +15,7 @@
           self.clanModules.matrix-synapse
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "machine";
+            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
 
             services.nginx.virtualHosts."matrix.clan.test" = {

checks/mumble/default.nix

@@ -32,7 +32,7 @@
         imports = [
           common
           {
-            clan.core.machineName = "peer1";
+            clan.core.settings.machine.name = "peer1";
             environment.etc = {
               "mumble-key".source = ./peer_1/peer_1_test_key;
               "mumble-cert".source = ./peer_1/peer_1_test_cert;
@@ -64,7 +64,7 @@
         imports = [
           common
           {
-            clan.core.machineName = "peer2";
+            clan.core.settings.machine.name = "peer2";
             environment.etc = {
               "mumble-key".source = ./peer_2/peer_2_test_key;
               "mumble-cert".source = ./peer_2/peer_2_test_cert;

checks/secrets/default.nix

@@ -11,7 +11,7 @@
       sops.age.keyFile = "/etc/privkey.age";
 
       clan.core.settings.directory = "${./.}";
-      clan.core.machineName = "machine";
+      clan.core.settings.machine.name = "machine";
 
       networking.hostName = "machine";
     };

checks/syncthing/default.nix

@@ -12,7 +12,7 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "introducer";
+            clan.core.settings.machine.name = "introducer";
             clan.core.settings.directory = ./.;
             environment.etc = {
               "syncthing.pam".source = ./introducer/introducer_test_cert;
@@ -53,7 +53,7 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "peer1";
+            clan.core.settings.machine.name = "peer1";
             clan.core.settings.directory = ./.;
             clan.syncthing.introducer = lib.strings.removeSuffix "\n" (
               builtins.readFile ./introducer/introducer_device_id
@@ -75,7 +75,7 @@
           self.clanModules.syncthing
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "peer2";
+            clan.core.settings.machine.name = "peer2";
             clan.core.settings.directory = ./.;
             clan.syncthing.introducer = lib.strings.removeSuffix "\n" (
               builtins.readFile ./introducer/introducer_device_id

checks/wayland-proxy-virtwl/default.nix

@@ -14,7 +14,7 @@ import ../lib/test-base.nix (
         imports = [
           self.nixosModules.clanCore
           {
-            clan.core.machineName = "machine";
+            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];

checks/zt-tcp-relay/default.nix

@@ -10,7 +10,7 @@
           self.nixosModules.clanCore
           self.clanModules.zt-tcp-relay
           {
-            clan.core.machineName = "machine";
+            clan.core.settings.machine.name = "machine";
             clan.core.settings.directory = ./.;
           }
         ];