Merge remote-tracking branch 'pnp/master' into master
This commit is contained in:
commit
b2de0815bd
|
@ -3,15 +3,6 @@
|
||||||
with import ../../4lib/tv { inherit lib pkgs; };
|
with import ../../4lib/tv { inherit lib pkgs; };
|
||||||
let
|
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 ;
|
repos = priv-repos // krebs-repos ;
|
||||||
rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-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:
|
krebs-rules = with config.krebs.users; repo:
|
||||||
set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ;
|
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;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user