Merge remote-tracking branch 'cd/master'

This commit is contained in:
makefu 2016-06-12 17:49:59 +02:00
commit a34e0f7d1d
2 changed files with 21 additions and 19 deletions

View file

@ -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;
};
}

View file

@ -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;
};
}