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

cleanup deprecated facts options

Browse Source
This commit is contained in:
Jörg Thalheim
2024-07-21 18:02:22 +02:00
parent e0640b0a29
commit 7004d1ea7f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixosModules/clanCore/vm.nix
View File

@@ -88,7 +88,7 @@ let
fsType = "ext4"; fsType = "ext4";
}; };
${config.clan.core.secretsUploadDirectory} = { ${config.clan.core.facts.secretUploadDirectory} = {
device = "secrets"; device = "secrets";
fsType = "9p"; fsType = "9p";
neededForBoot = true; neededForBoot = true;

4
pkgs/clan-cli/tests/machines/vm1/default.nix
View File

@@ -3,10 +3,10 @@
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version; system.stateVersion = lib.version;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__"; sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.secretsUploadDirectory = "__CLAN_SOPS_KEY_DIR__"; clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.virtualisation.graphics = false; clan.virtualisation.graphics = false;
clan.core.networking.zerotier.controller.enable = true; clan.core.facts.networking.zerotier.controller.enable = true;
networking.useDHCP = false; networking.useDHCP = false;
systemd.services.shutdown-after-boot = { systemd.services.shutdown-after-boot = {

2
pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix
View File

@@ -3,7 +3,7 @@
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version; system.stateVersion = lib.version;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__"; sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.secretsUploadDirectory = "__CLAN_SOPS_KEY_DIR__"; clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.virtualisation.graphics = false; clan.virtualisation.graphics = false;
clan.core.networking.zerotier.controller.enable = true; clan.core.networking.zerotier.controller.enable = true;

4
pkgs/clan-cli/tests/test_flake_with_core/flake.nix
View File

@@ -18,7 +18,7 @@
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version; system.stateVersion = lib.version;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__"; sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.secretsUploadDirectory = "__CLAN_SOPS_KEY_DIR__"; clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.core.sops.defaultGroups = [ "admins" ]; clan.core.sops.defaultGroups = [ "admins" ];
clan.virtualisation.graphics = false; clan.virtualisation.graphics = false;
@@ -48,7 +48,7 @@
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version; system.stateVersion = lib.version;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__"; sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.secretsUploadDirectory = "__CLAN_SOPS_KEY_DIR__"; clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.core.networking.zerotier.networkId = "82b44b162ec6c013"; clan.core.networking.zerotier.networkId = "82b44b162ec6c013";
}; };
}; };