Merge pull request 'openssh fixes' (#983) from openssh into main
This commit is contained in:
commit
3476945fff
@ -2,7 +2,7 @@
|
|||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
services.openssh.hostKeys = [{
|
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";
|
type = "ed25519";
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
@ -147,14 +147,14 @@
|
|||||||
description = ''
|
description = ''
|
||||||
path to a fact which is generated by the generator
|
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 {
|
value = lib.mkOption {
|
||||||
defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}";
|
defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}";
|
||||||
type = lib.types.nullOr lib.types.str;
|
type = lib.types.nullOr lib.types.str;
|
||||||
default =
|
default =
|
||||||
if builtins.pathExists "${config.clanCore.clanDir}/${fact.config.path}" then
|
if builtins.pathExists fact.config.path then
|
||||||
lib.strings.removeSuffix "\n" (builtins.readFile "${config.clanCore.clanDir}/${fact.config.path}")
|
lib.strings.fileContents fact.config.path
|
||||||
else
|
else
|
||||||
null;
|
null;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user