summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/git
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-14 15:05:36 +0100
committerlassulus <lass@aidsballs.de>2015-12-14 15:05:36 +0100
commitd94784efbecbd437ec6268bb9bfca57a8088d6e8 (patch)
tree7806084d08adc5ffec4c3372fa9145a8d9df415e /makefu/2configs/git
parent9c1207a52825da2f7d9c55304f864d68055cedb8 (diff)
parent6f150af8acf2195188518bf53d0330da7a4bb8f8 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/git')
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 304d39fcd..68fd976d6 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -24,6 +24,7 @@ let
connector-repos = mapAttrs make-priv-repo {
connector = { };
+ minikrebs = { };
mattermost = {
desc = "Mattermost Docker files";
};
@@ -42,7 +43,7 @@ let
hooks = {
post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName;
- verbose = config.krebs.build.host.name == "pnp";
+ verbose = config.krebs.build.host.name == "gum";
channel = "#retiolum";
# TODO remove the hardcoded hostname
server = "cd.retiolum";
@@ -54,7 +55,7 @@ let
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv uriel ];
- all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp ];
+ all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp makefu-vbob ];
all-exco = with config.krebs.users; [ exco ];
priv-rules = repo: set-owners repo all-makefu;
@@ -85,6 +86,10 @@ in {
name = "makefu-omo" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub;
};
+ makefu-vbob = {
+ name = "makefu-vbob" ;
+ pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_vbob.ssh.pub;
+ };
makefu-tsp = {
name = "makefu-tsp" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub;