diff options
| author | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
| commit | 8c6bd7431c8620fa65466e880fbd38e2c555367d (patch) | |
| tree | 9d73f67cf751a6f3f99b6a5a0c3dd0ddaee16382 /nin/2configs | |
| parent | 6ad170e7621668fdcf03aab37d1f9843e446d2da (diff) | |
| parent | a9f803207243425d5c06ce82820c27a4de8af5ad (diff) | |
Merge remote-tracking branch 'lass/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 ]; } ++ |