summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-17 22:16:55 +0100
committermakefu <github@syntax-fehler.de>2015-11-17 22:16:55 +0100
commitb2ac9b092a36c3196469099c73c64c8ca6626be0 (patch)
tree31b2738c7255feea185593c2274cd949392e9c79 /makefu/2configs
parent7346527c4f0444d33f8c6eda353cad94cecd930f (diff)
makefu: fix cgit for wry, add gc to wry
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix23
1 files changed, 12 insertions, 11 deletions
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 748cd6427..e12827697 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -22,7 +22,7 @@ let
};
connector-repos = mapAttrs make-priv-repo {
- autosync = { };
+ connector = { };
};
@@ -36,7 +36,7 @@ let
inherit name desc;
public = true;
hooks = {
- post-receive = git.irc-announce {
+ post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName;
verbose = config.krebs.build.host.name == "pnp";
channel = "#retiolum";
@@ -51,11 +51,11 @@ 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 ];
- exco = with config.krebs.users; [ exco ];
+ all-exco = with config.krebs.users; [ exco ];
priv-rules = repo: set-owners repo all-makefu;
- connector-rules = repo: set-owners repo (all-makefu ++ exco);
+ connector-rules = repo: set-owners repo all-makefu ++ set-owners repo all-exco;
krebs-rules = repo:
set-owners repo all-makefu ++ set-ro-access repo krebsminister;
@@ -76,18 +76,19 @@ let
in {
imports = [{
- krebs.users.makefu-omo = {
+ krebs.users = {
+ makefu-omo = {
name = "makefu-omo" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub;
- };
- krebs.users.makefu-tsp = {
+ };
+ makefu-tsp = {
name = "makefu-tsp" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub;
- };
-
- krebs.users.exco = {
- name = "exco" ;
+ };
+ exco = {
+ name = "exco";
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/exco.ssh.pub;
+ };
};
}];
krebs.git = {