From 7004d1ea7fdabe2edfb810243c923b598f5b0b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jul 2024 18:02:22 +0200 Subject: [PATCH] cleanup deprecated facts options --- nixosModules/clanCore/vm.nix | 2 +- pkgs/clan-cli/tests/machines/vm1/default.nix | 4 ++-- pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix | 2 +- pkgs/clan-cli/tests/test_flake_with_core/flake.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixosModules/clanCore/vm.nix b/nixosModules/clanCore/vm.nix index cad534f31..fd0b438ea 100644 --- a/nixosModules/clanCore/vm.nix +++ b/nixosModules/clanCore/vm.nix @@ -88,7 +88,7 @@ let fsType = "ext4"; }; - ${config.clan.core.secretsUploadDirectory} = { + ${config.clan.core.facts.secretUploadDirectory} = { device = "secrets"; fsType = "9p"; neededForBoot = true; diff --git a/pkgs/clan-cli/tests/machines/vm1/default.nix b/pkgs/clan-cli/tests/machines/vm1/default.nix index bf87046c5..8c4b81e18 100644 --- a/pkgs/clan-cli/tests/machines/vm1/default.nix +++ b/pkgs/clan-cli/tests/machines/vm1/default.nix @@ -3,10 +3,10 @@ clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; system.stateVersion = lib.version; 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.core.networking.zerotier.controller.enable = true; + clan.core.facts.networking.zerotier.controller.enable = true; networking.useDHCP = false; systemd.services.shutdown-after-boot = { diff --git a/pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix b/pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix index bf87046c5..cd3dd7b83 100644 --- a/pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix +++ b/pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix @@ -3,7 +3,7 @@ clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; system.stateVersion = lib.version; 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.core.networking.zerotier.controller.enable = true; diff --git a/pkgs/clan-cli/tests/test_flake_with_core/flake.nix b/pkgs/clan-cli/tests/test_flake_with_core/flake.nix index aaf4fd8da..c67837be5 100644 --- a/pkgs/clan-cli/tests/test_flake_with_core/flake.nix +++ b/pkgs/clan-cli/tests/test_flake_with_core/flake.nix @@ -18,7 +18,7 @@ clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; system.stateVersion = lib.version; 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.virtualisation.graphics = false; @@ -48,7 +48,7 @@ clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__"; system.stateVersion = lib.version; 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"; }; };