clan/clan-core
12
3
Fork 15
Code Issues 94 Pull Requests 4 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'openssh fixes' (#983) from openssh into main
All checks were successful
checks / check-links (push) Successful in 21s
Details
checks / checks (push) Successful in 37s
Details
checks / checks-impure (push) Successful in 1m49s
Details

Browse Source
This commit is contained in:
clan-bot 2024-03-13 14:04:25 +00:00
commit 3476945fff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clanModules/sshd.nix
View File

@ -2,7 +2,7 @@
services.openssh.enable = true;
services.openssh.hostKeys = [{
path = config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path;
path = builtins.storePath config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path;
type = "ed25519";
}];

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

@ -147,14 +147,14 @@
description = ''
path to a fact which is generated by the generator
'';
default = "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}";
type = lib.types.nullOr lib.types.str;
default =
if builtins.pathExists "${config.clanCore.clanDir}/${fact.config.path}" then
lib.strings.removeSuffix "\n" (builtins.readFile "${config.clanCore.clanDir}/${fact.config.path}")
if builtins.pathExists fact.config.path then
lib.strings.fileContents fact.config.path
else
null;
};