diff options
author | tv <tv@krebsco.de> | 2015-07-29 14:58:43 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-07-29 14:58:43 +0200 |
commit | 4c4d817ca45e2480d1aabdd401af642262d5a0f3 (patch) | |
tree | 0b5918c39df35bdba5eb378e82bf4d0cc1297d25 | |
parent | 1cbf3f264ad073bee5766627bcb8364c52c22f9c (diff) | |
parent | 0ed5a962f1d4c03f743e8d491a8c30860268821b (diff) |
Merge remote-tracking branch 'pnp/master' into master
-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 7b8e3bc..d0351a9 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; + }; +} |