diff options
| author | tv <tv@krebsco.de> | 2018-01-09 19:06:50 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-01-09 19:06:50 +0100 |
| commit | 8bdfb259525db56a7c70f45545ee1c7fb17cbe03 (patch) | |
| tree | 4af60dce5942350e8f76e95d532631468a4aa9a9 /nin/2configs | |
| parent | 9185e8c2341a1efa0af86edee7dd82c0bf246652 (diff) | |
| parent | aef0ce1766723a593c3788ce060853bfb86a1e9d (diff) | |
Merge remote-tracking branch 'prism/master'
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 d7b89c8..62f499a 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 2a86046..9ebbaab 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 ]; } ++ |