diff options
| author | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
| commit | 183b001e1aca601e420ef07ec4944a15c13a8d2c (patch) | |
| tree | 9d34f79c2ee7cb073a39ab44ef2795055a42d067 /nin/2configs | |
| parent | ea85e788ae2a6ca24ccb997372542f7f2a104080 (diff) | |
| parent | e083b18e34519f30bba79dfd894c3b828fd13da7 (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'nin/2configs')
| -rw-r--r-- | nin/2configs/default.nix | 2 | ||||
| -rw-r--r-- | nin/2configs/git.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index d7b89c80c..62f499a2d 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -16,6 +16,7 @@ with import <stockholm/lib>; root = { openssh.authorizedKeys.keys = [ config.krebs.users.nin.pubkey + config.krebs.users.nin_h.pubkey ]; }; nin = { @@ -31,6 +32,7 @@ with import <stockholm/lib>; ]; openssh.authorizedKeys.keys = [ config.krebs.users.nin.pubkey + config.krebs.users.nin_h.pubkey ]; }; }; diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 2a8604689..9ebbaabd2 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -53,7 +53,7 @@ let with git // config.krebs.users; repo: singleton { - user = [ nin ]; + user = [ nin nin_h ]; repo = [ repo ]; perm = push "refs/*" [ non-fast-forward create delete merge ]; } ++ |