diff options
| author | Roman Volosatovs <rvolosatovs@riseup.net> | 2018-06-12 18:30:53 +0200 |
|---|---|---|
| committer | Roman Volosatovs <rvolosatovs@riseup.net> | 2018-06-12 18:30:53 +0200 |
| commit | 1846a85b77c60c2f72c95ee63f7f43a5557f8a48 (patch) | |
| tree | cc3a0a2429c7401f62b3deab9b568f06782fcc0c /nixos/modules/services/networking/ssh | |
| parent | 9953edaf75a34ddb3f4ab360d71502d829dc0fc5 (diff) | |
| download | nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar.gz nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar.bz2 nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar.lz nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar.xz nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.tar.zst nixpkgs-1846a85b77c60c2f72c95ee63f7f43a5557f8a48.zip | |
sshd: Add issue references to services.openssh.authorizedKeysFiles
Diffstat (limited to 'nixos/modules/services/networking/ssh')
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 9a6ac024bd4..77673b5287b 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -413,6 +413,9 @@ in unixAuth = cfg.passwordAuthentication; }; + # These values are merged with the ones defined externally, see: + # https://github.com/NixOS/nixpkgs/pull/10155 + # https://github.com/NixOS/nixpkgs/pull/41745 services.openssh.authorizedKeysFiles = [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ]; |