Revert "Merge pull request 'machine_id_v2' (#2052) from Qubasa/clan-core:machine_id_v2 into main"
This reverts commit22a11abfe5, reversing changes made to208b71ac0e.
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
{
|
||||
clan.core.machineName = "machine";
|
||||
clan.core.clanDir = ./.;
|
||||
|
||||
clan.core.state.testState.folders = [ "/etc/state" ];
|
||||
environment.etc.state.text = "hello world";
|
||||
systemd.tmpfiles.settings."vmsecrets" = {
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
networking.hostName = "machine";
|
||||
services.openssh.enable = true;
|
||||
services.openssh.startWhenNeeded = false;
|
||||
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
@@ -13,14 +13,10 @@
|
||||
{
|
||||
imports = [
|
||||
self.clanModules.single-disk
|
||||
self.clanModules.factless
|
||||
(modulesPath + "/testing/test-instrumentation.nix") # we need these 2 modules always to be able to run the tests
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
clan.single-disk.device = "/dev/vdb";
|
||||
clan.factless = {
|
||||
diskId = "ac51e4623c804dcbbce0144ed8e16e55";
|
||||
};
|
||||
|
||||
environment.etc."install-successful".text = "ok";
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
AGE-SECRET-KEY-1KF8E3SR3TTGL6M476SKF7EEMR4H9NF7ZWYSLJUAK8JX276JC7KUSSURKFK
|
||||
@@ -1 +0,0 @@
|
||||
age1dhwqzkah943xzc34tc3dlmfayyevcmdmxzjezdgdy33euxwf59vsp3vk3c
|
||||
@@ -32,7 +32,6 @@
|
||||
common
|
||||
{
|
||||
clan.core.machineName = "peer1";
|
||||
|
||||
environment.etc = {
|
||||
"mumble-key".source = ./peer_1/peer_1_test_key;
|
||||
"mumble-cert".source = ./peer_1/peer_1_test_cert;
|
||||
|
||||
@@ -8,9 +8,7 @@ let
|
||||
self.nixosModules.clanCore
|
||||
# This is the only option that is not part of the
|
||||
# module because it is usually set by flake-parts
|
||||
{
|
||||
clan.core.clanDir = ./.;
|
||||
}
|
||||
{ clan.core.clanDir = ./.; }
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user