diff options
author | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
commit | bf405736962fd20df738f84665e5fc7f8d74e72d (patch) | |
tree | ae01054fe88089d6476b3c1b1952066fd6c79092 /krebs/3modules/git.nix | |
parent | 7e1bd2729e11e5c63749c69093359de0bb3329b2 (diff) | |
parent | 89c5b22129d3cb875d16a3171a4e3ab3bee9cb0a (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/git.nix')
-rw-r--r-- | krebs/3modules/git.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 164831846..a08dbb32c 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -339,9 +339,11 @@ let description = "Git repository hosting user"; shell = "/bin/sh"; openssh.authorizedKeys.keys = - mapAttrsToList (_: makeAuthorizedKey git-ssh-command) - (filterAttrs (_: user: isString user.pubkey) - config.krebs.users); + unique + (sort lessThan + (map (makeAuthorizedKey git-ssh-command) + (filter (user: isString user.pubkey) + (concatMap (getAttr "user") cfg.rules)))); }; }; |