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

Merge pull request 'sshd: module fix impurity' (#987) from openssh into main

Browse Source
This commit is contained in:
clan-bot
2024-03-17 17:20:10 +00:00
parent 1bc61bb4af 99ea2ffe1c
commit 66e57b1f04
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,7 +9,6 @@ example_clan
result* result*
/pkgs/clan-cli/clan_cli/nixpkgs /pkgs/clan-cli/clan_cli/nixpkgs
/pkgs/clan-cli/clan_cli/webui/assets /pkgs/clan-cli/clan_cli/webui/assets
/machines
nixos.qcow2 nixos.qcow2
**/*.glade~ **/*.glade~

2
clanModules/sshd.nix
View File

@@ -2,7 +2,7 @@
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.hostKeys = [{ 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"; type = "ed25519";
}]; }];

1
machines/test_backup_client/facts/borgbackup.ssh.pub Normal file
View File

@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIbwIVnLy+uoDZ6uK/OCc1QK46SIGeC3mVc85dqLYQw lass@ignavia

4
nixosModules/clanCore/secrets/default.nix
View File

@@ -143,11 +143,11 @@
default = fact.config._module.args.name; default = fact.config._module.args.name;
}; };
path = lib.mkOption { path = lib.mkOption {
type = lib.types.str; type = lib.types.path;
description = '' description = ''
path to a fact which is generated by the generator 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 { value = lib.mkOption {
defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}"; defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}";

2
pkgs/installer/flake-module.nix
View File

@@ -29,7 +29,7 @@ in
flake.packages.x86_64-linux.install-iso = self.inputs.disko.lib.makeDiskImages { flake.packages.x86_64-linux.install-iso = self.inputs.disko.lib.makeDiskImages {
nixosConfig = installer; nixosConfig = installer;
}; };
flake.nixosConfigurations = clan.nixosConfigurations; flake.nixosConfigurations = { inherit (clan.nixosConfigurations) installer; };
flake.clanInternals = clan.clanInternals; flake.clanInternals = clan.clanInternals;
flake.apps.x86_64-linux.install-vm.program = installer.config.formats.vm.outPath; 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; flake.apps.x86_64-linux.install-vm-nogui.program = installer.config.formats.vm-nogui.outPath;