From 671710c573980d859cb82993cd0514058a63262f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 29 Jul 2015 14:22:24 +0200
Subject: makefu: add new git user makefu-omo

---
 Zpubkeys/makefu_omo.ssh.pub       |  1 +
 makefu/0make/pnp.makefile         |  4 ----
 makefu/2configs/cgit-retiolum.nix | 24 +++++++++++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 Zpubkeys/makefu_omo.ssh.pub
 delete mode 100644 makefu/0make/pnp.makefile

diff --git a/Zpubkeys/makefu_omo.ssh.pub b/Zpubkeys/makefu_omo.ssh.pub
new file mode 100644
index 000000000..5567040fb
--- /dev/null
+++ b/Zpubkeys/makefu_omo.ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtDhAxjiCH0SmTGNDqmlKPug9qTf+IFOVjdXfk01lAV2KMVW00CgNo2d5kl5+6pM99K7zZO7Uo7pmSFLSCAg8J6cMRI3v5OxFsnQfcJ9TeGLZt/ua7F8YsyIIr5wtqKtFbujqve31q9xJMypEpiX4np3nLiHfYwcWu7AFAUY8UHcCNl4JXm6hsmPe+9f6Mg2jICOdkfMMn0LtW+iq1KZpw1Nka2YUSiE2YuUtV+V+YaVMzdcjknkVkZNqcVk6tbJ1ZyZKM+bFEnE4VkHJYDABZfELpcgBAszfWrVG0QpEFjVCUq5atpIVHJcWWDx072r0zgdTPcBuzsHHC5PRfVBLEw== makefu@servarch
diff --git a/makefu/0make/pnp.makefile b/makefu/0make/pnp.makefile
deleted file mode 100644
index a18efe0e0..000000000
--- a/makefu/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/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index 777c16cfb..7dfb181c5 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/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;
   };
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/79100000.lock: No such file or directory (2)