From 704fa01df29cc9de8d4956d619d02b123624ad63 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 29 Jul 2015 14:22:24 +0200
Subject: [PATCH] makefu: add new git user makefu-omo
---
0make/pnp.makefile | 4 ----
2configs/cgit-retiolum.nix | 24 +++++++++++++++++-------
2 files changed, 17 insertions(+), 11 deletions(-)
delete mode 100644 0make/pnp.makefile
diff --git a/0make/pnp.makefile b/0make/pnp.makefile
deleted file mode 100644
index a18efe0..0000000
--- a/0make/pnp.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@pnp
-nixpkgs_url := https://github.com/nixos/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/makefu/secrets/pnp
diff --git a/2configs/cgit-retiolum.nix b/2configs/cgit-retiolum.nix
index 777c16c..7dfb181 100644
--- a/2configs/cgit-retiolum.nix
+++ b/2configs/cgit-retiolum.nix
@@ -30,12 +30,13 @@ let
post-receive = git.irc-announce {
nick = config.networking.hostName;
channel = "#retiolum";
+ # TODO remove the hardcoded hostname
server = "cd.retiolum";
};
};
};
- set-owners = with git; repo: user:
+ set-owners = with git;repo: user:
singleton {
inherit user;
repo = [ repo ];
@@ -52,17 +53,26 @@ let
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv uriel ];
- priv-rules = with config.krebs.users; repo:
- set-owners repo [ makefu ];
+ #all-makefu = with config.krebs.users; [ makefu ];
- krebs-rules = with config.krebs.users; repo:
- set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ;
+
+ all-makefu = with config.krebs.users; [ makefu makefu-omo ];
+
+ priv-rules = repo: set-owners repo all-makefu;
+
+ krebs-rules = repo:
+ set-owners repo all-makefu ++ set-ro-access repo krebsminister;
in {
- imports = [ ../../3modules/krebs/git.nix ];
+ imports = [{
+ krebs.users.makefu-omo = {
+ name = "makefu-omo" ;
+ pubkey= with builtins; readFile ../../Zpubkeys/makefu_omo.ssh.pub;
+ };
+ }];
krebs.git = {
enable = true;
- root-title = "public repositories ";
+ root-title = "public repositories";
root-desc = "keep on krebsing";
inherit repos rules;
};