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

fix system.stateVersion

Browse Source
This commit is contained in:
Jörg Thalheim
2025-02-14 12:13:36 +07:00
parent f8bf39e43a
commit d3bd120a04
10 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{ lib, ... }:
{ config, ... }:
{
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.virtualisation.graphics = false;

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

@@ -1,7 +1,7 @@
{ lib, ... }:
{ config, ... }:
{
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.virtualisation.graphics = false;

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

@@ -1,7 +1,7 @@
{ lib, ... }:
{ config, ... }:
{
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
clan.virtualisation.graphics = false;
networking.useDHCP = false;

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

@@ -14,11 +14,11 @@
meta.name = "test_flake_with_core";
machines = {
vm1 =
{ lib, ... }:
{ config, ... }:
{
nixpkgs.hostPlatform = "x86_64-linux";
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.core.sops.defaultGroups = [ "admins" ];
@@ -28,7 +28,7 @@
networking.useDHCP = false;
};
vm2 =
{ lib, ... }:
{ config, ... }:
{
nixpkgs.hostPlatform = "x86_64-linux";
imports = [
@@ -39,7 +39,7 @@
clan.user-password.user = "alice";
clan.user-password.prompt = false;
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
clan.core.networking.zerotier.networkId = "82b44b162ec6c013";

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

@@ -13,7 +13,7 @@
meta.name = "test_flake_with_core_and_pass";
machines = {
vm1 =
{ lib, ... }:
{ lib, config, ... }:
{
imports = [
clan-core.clanModules.sshd
@@ -24,7 +24,7 @@
clan.user-password.prompt = false;
clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
system.stateVersion = lib.version;
system.stateVersion = config.system.nixos.release;
clan.core.facts.secretStore = "password-store";
clan.core.facts.secretUploadDirectory = lib.mkForce "__CLAN_SOPS_KEY_DIR__/secrets";