diff options
author | lassulus <lassulus@lassul.us> | 2018-01-03 18:34:25 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-01-03 18:34:25 +0100 |
commit | 9f5b7df0f92959106b7e31551e9c31552c4f06ca (patch) | |
tree | 3278c9fb4c5525c9fbed28a05aaea9ba8351c2c3 /nin | |
parent | 788cc63754e7dc4f559087ae37b74017e6b77d39 (diff) | |
parent | 3e976918e64249a11cb433b587db094bb6105af3 (diff) |
Merge remote-tracking branch 'onondaga/master'
Diffstat (limited to 'nin')
-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 d7b89c80..62f499a2 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 2a860468..9ebbaabd 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 ]; } ++ |