diff options
| author | makefu <github@syntax-fehler.de> | 2015-07-24 21:04:22 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-07-24 21:04:22 +0200 |
| commit | e1f4ef731f34056c8360de8be21c2bfbc396d2e4 (patch) | |
| tree | a960212d1ee8b0666ebb934c383816900d45cc7a /3modules/krebs/git.nix | |
| parent | 7d71db1eb0ce36f8be914f53412615eba0090747 (diff) | |
| parent | a62be1cef8726a2afa61df3dac9e19a71882b370 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to '3modules/krebs/git.nix')
| -rw-r--r-- | 3modules/krebs/git.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/3modules/krebs/git.nix b/3modules/krebs/git.nix index 2d747cc1..499d3309 100644 --- a/3modules/krebs/git.nix +++ b/3modules/krebs/git.nix @@ -6,8 +6,7 @@ # TODO when authorized_keys changes, then restart ssh # (or kill already connected users somehow) -with builtins; -with lib; +with import ../../4lib/krebs { inherit lib; }; let cfg = config.krebs.git; @@ -127,9 +126,6 @@ let rules = mkOption { type = types.unspecified; }; - users = mkOption { - type = types.unspecified; - }; }; git-imp = { @@ -157,7 +153,8 @@ let name = "git"; shell = "/bin/sh"; openssh.authorizedKeys.keys = - mapAttrsToList (_: makeAuthorizedKey git-ssh-command) cfg.users; + mapAttrsToList (_: makeAuthorizedKey git-ssh-command) + config.krebs.users; uid = 129318403; # genid git }; }; @@ -263,7 +260,7 @@ let isPublicRepo = getAttr "public"; # TODO this is also in ./cgit.nix - makeAuthorizedKey = git-ssh-command: user@{ name, pubkey }: + makeAuthorizedKey = git-ssh-command: user@{ name, pubkey, ... }: # TODO assert name # TODO assert pubkey let |