summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-01-09 17:14:51 +0100
committerlassulus <lass@lassul.us>2017-01-09 17:14:51 +0100
commit2e72ce83674b6e0362f0ed6789cba47a671476cd (patch)
tree4311c7137602cc2133d60dc91c268e0dc571512a /krebs/3modules
parent44800f5ca9b79d64836cb1bb4c318b64182ad6aa (diff)
parent9779351be952095ed55ad4ccee98452a8838cfb9 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/git.nix8
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))));
};
};