19.09: fixed ssh key problem with init-ssh
This commit is contained in:
parent
3b5156a88a
commit
ea1c05b693
3 changed files with 5 additions and 2 deletions
|
@ -21,7 +21,6 @@
|
||||||
configuration.init-ssh = {
|
configuration.init-ssh = {
|
||||||
enable = "enabled";
|
enable = "enabled";
|
||||||
kernelModules = [ "e1000e" ];
|
kernelModules = [ "e1000e" ];
|
||||||
authorizedKeys = config.users.users.root.openssh.authorizedKeys.keyFiles;
|
|
||||||
hostECDSAKey = <secrets/init-ssh/host_ecdsa_key>;
|
hostECDSAKey = <secrets/init-ssh/host_ecdsa_key>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
configuration.init-ssh = {
|
configuration.init-ssh = {
|
||||||
enable = "enabled";
|
enable = "enabled";
|
||||||
kernelModules = [ "r8169" ];
|
kernelModules = [ "r8169" ];
|
||||||
authorizedKeys = config.users.users.root.openssh.authorizedKeys.keyFiles;
|
|
||||||
hostECDSAKey = <secrets/init-ssh/host_ecdsa_key>;
|
hostECDSAKey = <secrets/init-ssh/host_ecdsa_key>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,11 @@ in {
|
||||||
|
|
||||||
authorizedKeys = mkOption {
|
authorizedKeys = mkOption {
|
||||||
type = with types; listOf str;
|
type = with types; listOf str;
|
||||||
|
default = config.users.users.root.openssh.authorizedKeys.keys ++ (
|
||||||
|
map
|
||||||
|
(keyFile: lib.fileContents keyFile)
|
||||||
|
config.users.users.root.openssh.authorizedKeys.keyFiles
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
hostDSSKey = mkOption {
|
hostDSSKey = mkOption {
|
||||||
|
|
Loading…
Reference in a new issue