diff options
author | tv <tv@shackspace.de> | 2015-07-29 14:58:43 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-07-29 14:58:43 +0200 |
commit | b2de0815bd6f4387debd6918381eb66c76a2bb35 (patch) | |
tree | 6f71ca0dcec7166a5f4f3e3e43eea63fba2435eb /2configs | |
parent | c58ab1ba4978aae8200bc840fbfe6d9d62a0759d (diff) | |
parent | 82991c7c80dcf69c15fb5235afeb23455940311f (diff) |
Merge remote-tracking branch 'pnp/master' into master
Diffstat (limited to '2configs')
-rw-r--r-- | 2configs/makefu/cgit-retiolum.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/2configs/makefu/cgit-retiolum.nix b/2configs/makefu/cgit-retiolum.nix index 7b8e3bc97..d0351a9af 100644 --- a/2configs/makefu/cgit-retiolum.nix +++ b/2configs/makefu/cgit-retiolum.nix @@ -3,15 +3,6 @@ with import ../../4lib/tv { inherit lib pkgs; }; let - out = { - imports = [ ../../3modules/krebs/git.nix ]; - krebs.git = { - enable = true; - root-title = "public repositories "; - root-desc = "keep on krebsing"; - inherit repos rules; - }; - }; repos = priv-repos // krebs-repos ; rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos); @@ -67,4 +58,12 @@ let krebs-rules = with config.krebs.users; repo: set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ; -in out +in { + imports = [ ../../3modules/krebs/git.nix ]; + krebs.git = { + enable = true; + root-title = "public repositories "; + root-desc = "keep on krebsing"; + inherit repos rules; + }; +} |