diff options
author | tv <tv@krebsco.de> | 2016-06-07 03:14:21 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-06-07 22:38:38 +0200 |
commit | 4a34b27c1c6c3fea2b336c0316c597d74460b428 (patch) | |
tree | 97b718fe06acba0f298a78207ed9a5cbfd542b1e /makefu/2configs/git | |
parent | 6fcc35afb0003f0885994b3c09e401f3178d7a08 (diff) |
krebs.git.cgit: make `cache-root` configurable
... along with all the other stuff :)
Diffstat (limited to 'makefu/2configs/git')
-rw-r--r-- | makefu/2configs/git/brain-retiolum.nix | 14 | ||||
-rw-r--r-- | makefu/2configs/git/cgit-retiolum.nix | 26 |
2 files changed, 21 insertions, 19 deletions
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix index 80e4c87cf..ae54c6dbf 100644 --- a/makefu/2configs/git/brain-retiolum.nix +++ b/makefu/2configs/git/brain-retiolum.nix @@ -7,9 +7,7 @@ let rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos); krebs-repos = mapAttrs make-krebs-repo { - brain = { - desc = "braiiiins"; - }; + brain = { }; }; priv-repos = mapAttrs make-priv-repo { @@ -18,13 +16,13 @@ let }; # TODO move users to separate module - make-priv-repo = name: { desc ? null, ... }: { - inherit name desc; + make-priv-repo = name: { ... }: { + inherit name; public = false; }; - make-krebs-repo = with git; name: { desc ? null, ... }: { - inherit name desc; + make-krebs-repo = with git; name: { ... }: { + inherit name; public = false; hooks = { post-receive = pkgs.git-hooks.irc-announce { @@ -63,7 +61,7 @@ in { imports = [ ]; krebs.git = { enable = true; - cgit = false; + cgit.enable = false; inherit repos rules; }; } diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 44d759488..fe2c850f7 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -10,17 +10,17 @@ let krebs-repos = mapAttrs make-krebs-repo { stockholm = { - desc = "Make all the systems into 1systems!"; + cgit.desc = "Make all the systems into 1systems!"; }; tinc_graphs = { - desc = "Tinc Advanced Graph Generation"; + cgit.desc = "Tinc Advanced Graph Generation"; }; stockholm-init = { - desc = "Build new Stockholm hosts"; + cgit.desc = "Build new Stockholm hosts"; }; cac-api = { }; init-stockholm = { - desc = "Init stuff for stockholm"; + cgit.desc = "Init stuff for stockholm"; }; }; @@ -32,19 +32,19 @@ let connector = { }; minikrebs = { }; mattermost = { - desc = "Mattermost Docker files"; + cgit.desc = "Mattermost Docker files"; }; }; # TODO move users to separate module - make-priv-repo = name: { desc ? null, ... }: { - inherit name desc; + make-priv-repo = name: { ... }: { + inherit name; public = false; }; - make-krebs-repo = with git; name: { desc ? null, ... }: { - inherit name desc; + make-krebs-repo = with git; name: { cgit ? {}, ... }: { + inherit cgit name; public = true; hooks = { post-receive = pkgs.git-hooks.irc-announce { @@ -88,8 +88,12 @@ let in { krebs.git = { enable = true; - root-title = "public repositories"; - root-desc = "keep on krebsing"; + cgit = { + settings = { + root-title = "public repositories"; + root-desc = "keep on krebsing"; + }; + }; inherit repos rules; }; } |