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 | 8ff5c5e992ebafeca5edb2b22a0ab700edc715a5 (patch) | |
| tree | e141f28bca4e5494669282d41c1c8dbbc96b4ce8 /nin/2configs | |
| parent | fb0bbec70ae1a0dd4fdc3c9bc9ed47f2a8573fd9 (diff) | |
| parent | 5ef3a2c6caa2f018c2adf795de992e0487dd2413 (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 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 ]; } ++ |