From 377302ff6c1ca52cfc51313c75377222465d7f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Mar 2024 11:44:18 +0100 Subject: [PATCH 1/3] change facts path to be reachable as a store path --- nixosModules/clanCore/secrets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixosModules/clanCore/secrets/default.nix b/nixosModules/clanCore/secrets/default.nix index 395acdc7..93fee0cc 100644 --- a/nixosModules/clanCore/secrets/default.nix +++ b/nixosModules/clanCore/secrets/default.nix @@ -147,7 +147,7 @@ description = '' path to a fact which is generated by the generator ''; - default = "${config.clanCore.clanDir}/machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; + default = config.clanCore.clanDir + "/machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; }; value = lib.mkOption { defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}"; From a6c3e15aca20a3ab7bf02e97cb6cff59293ffb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Mar 2024 11:46:27 +0100 Subject: [PATCH 2/3] don't use impure builtins.storePath --- clanModules/sshd.nix | 2 +- nixosModules/clanCore/secrets/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clanModules/sshd.nix b/clanModules/sshd.nix index 939fd327..0112a2ff 100644 --- a/clanModules/sshd.nix +++ b/clanModules/sshd.nix @@ -2,7 +2,7 @@ services.openssh.enable = true; services.openssh.hostKeys = [{ - path = builtins.storePath config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; + path = config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; type = "ed25519"; }]; diff --git a/nixosModules/clanCore/secrets/default.nix b/nixosModules/clanCore/secrets/default.nix index 93fee0cc..18371359 100644 --- a/nixosModules/clanCore/secrets/default.nix +++ b/nixosModules/clanCore/secrets/default.nix @@ -143,7 +143,7 @@ default = fact.config._module.args.name; }; path = lib.mkOption { - type = lib.types.str; + type = lib.types.path; description = '' path to a fact which is generated by the generator ''; From c15043c4f169da02b9fd9740fe006e3aae9bb874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Mar 2024 14:06:50 +0000 Subject: [PATCH 3/3] fix evaluation of backup module --- .gitignore | 1 - machines/test_backup_client/facts/borgbackup.ssh.pub | 1 + pkgs/installer/flake-module.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 machines/test_backup_client/facts/borgbackup.ssh.pub diff --git a/.gitignore b/.gitignore index 45b863ff..fed75a61 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ example_clan result* /pkgs/clan-cli/clan_cli/nixpkgs /pkgs/clan-cli/clan_cli/webui/assets -/machines nixos.qcow2 **/*.glade~ diff --git a/machines/test_backup_client/facts/borgbackup.ssh.pub b/machines/test_backup_client/facts/borgbackup.ssh.pub new file mode 100644 index 00000000..c305404c --- /dev/null +++ b/machines/test_backup_client/facts/borgbackup.ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIbwIVnLy+uoDZ6uK/OCc1QK46SIGeC3mVc85dqLYQw lass@ignavia diff --git a/pkgs/installer/flake-module.nix b/pkgs/installer/flake-module.nix index e9d8c875..8327591e 100644 --- a/pkgs/installer/flake-module.nix +++ b/pkgs/installer/flake-module.nix @@ -29,7 +29,7 @@ in flake.packages.x86_64-linux.install-iso = self.inputs.disko.lib.makeDiskImages { nixosConfig = installer; }; - flake.nixosConfigurations = clan.nixosConfigurations; + flake.nixosConfigurations = { inherit (clan.nixosConfigurations) installer; }; flake.clanInternals = clan.clanInternals; flake.apps.x86_64-linux.install-vm.program = installer.config.formats.vm.outPath; flake.apps.x86_64-linux.install-vm-nogui.program = installer.config.formats.vm-nogui.outPath;