yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove definitions of clan.core.settings.machine.name on tests

Browse Source
This commit is contained in:
DavHau
2025-04-02 18:54:18 +07:00
parent 73d14e078e
commit e897399e34
10 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
checks/borgbackup/default.nix
View File

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

3
checks/data-mesher/default.nix
View File

@@ -69,17 +69,14 @@
imports = serviceConfigs.machines.admin.machineImports; imports = serviceConfigs.machines.admin.machineImports;
config.clan.data-mesher.network.tld = "foo"; config.clan.data-mesher.network.tld = "foo";
config.clan.core.settings.machine.name = "admin";
}; };
peerConfig = { peerConfig = {
imports = serviceConfigs.machines.peer.machineImports; imports = serviceConfigs.machines.peer.machineImports;
config.clan.core.settings.machine.name = "peer";
}; };
signerConfig = { signerConfig = {
imports = serviceConfigs.machines.signer.machineImports; imports = serviceConfigs.machines.signer.machineImports;
clan.core.settings.machine.name = "signer";
}; };
in in

1
checks/deltachat/default.nix
View File

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

1
checks/matrix-synapse/default.nix
View File

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

2
checks/mumble/default.nix
View File

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

1
checks/secrets/default.nix
View File

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

3
checks/syncthing/default.nix
View File

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

1
checks/wayland-proxy-virtwl/default.nix
View File

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

1
checks/zt-tcp-relay/default.nix
View File

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

5
clanModules/mumble/test.nix
View File

@@ -9,7 +9,6 @@ pkgs.nixosTest {
self.inputs.clan-core.nixosModules.clanCore self.inputs.clan-core.nixosModules.clanCore
{ {
config = { config = {
clan.core.settings.machine.name = "peer1";
clan.core.settings.directory = ./.; clan.core.settings.directory = ./.;
documentation.enable = false; documentation.enable = false;
@@ -25,11 +24,7 @@ pkgs.nixosTest {
self.inputs.clan-core.nixosModules.clanCore self.inputs.clan-core.nixosModules.clanCore
{ {
config = { config = {
clan.core.settings.machine.name = "peer2";
clan.core.settings.directory = ./.; clan.core.settings.directory = ./.;
documentation.enable = false;
}; };
} }
]; ];