Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ssh: support multiple identity files in a match block

Browse source 
Fixes #625

(cherry picked from commit eec78fbd1e)
This commit is contained in:
Robert Helgesson 2019-03-19 22:35:13 +01:00
parent 594294e2ca
commit c40fa72cde
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/programs/ssh.nix
View file

@ -66,10 +66,15 @@ let
}; };
identityFile = mkOption { identityFile = mkOption {
type = types.nullOr types.str; type = with types; either (listOf str) (nullOr str);
default = null; default = [];
apply = p:
if p == null then []
else if isString p then [p]
else p;
description = '' description = ''
Specifies a file from which the user identity is read. Specifies files from which the user identity is read.
Identities will be tried in the given order.
''; '';
}; };
@ -165,7 +170,6 @@ let
++ optional cf.forwardX11Trusted " ForwardX11Trusted yes" ++ optional cf.forwardX11Trusted " ForwardX11Trusted yes"
++ optional cf.identitiesOnly " IdentitiesOnly yes" ++ optional cf.identitiesOnly " IdentitiesOnly yes"
++ optional (cf.user != null) " User ${cf.user}" ++ optional (cf.user != null) " User ${cf.user}"
++ optional (cf.identityFile != null) " IdentityFile ${cf.identityFile}"
++ optional (cf.certificateFile != null) " CertificateFile ${cf.certificateFile}" ++ optional (cf.certificateFile != null) " CertificateFile ${cf.certificateFile}"
++ optional (cf.hostname != null) " HostName ${cf.hostname}" ++ optional (cf.hostname != null) " HostName ${cf.hostname}"
++ optional (cf.addressFamily != null) " AddressFamily ${cf.addressFamily}" ++ optional (cf.addressFamily != null) " AddressFamily ${cf.addressFamily}"
@ -176,6 +180,7 @@ let
++ optional (!cf.checkHostIP) " CheckHostIP no" ++ optional (!cf.checkHostIP) " CheckHostIP no"
++ optional (cf.proxyCommand != null) " ProxyCommand ${cf.proxyCommand}" ++ optional (cf.proxyCommand != null) " ProxyCommand ${cf.proxyCommand}"
++ optional (cf.proxyJump != null) " ProxyJump ${cf.proxyJump}" ++ optional (cf.proxyJump != null) " ProxyJump ${cf.proxyJump}"
++ map (file: " IdentityFile ${file}") cf.identityFile
++ mapAttrsToList (n: v: " ${n} ${v}") cf.extraOptions ++ mapAttrsToList (n: v: " ${n} ${v}") cf.extraOptions
); );