From b2ac9b092a36c3196469099c73c64c8ca6626be0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Nov 2015 22:16:55 +0100
Subject: makefu: fix cgit for wry, add gc to wry

---
 makefu/1systems/wry.nix               |  8 ++++++--
 makefu/2configs/git/cgit-retiolum.nix | 23 ++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index cd39b4b9f..cd2b3f657 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -24,11 +24,11 @@ in {
       # other nginx
       ../2configs/nginx/euer.wiki.nix
       ../2configs/nginx/euer.blog.nix
+      ../2configs/nginx/euer.test.nix
 
       # collectd
       ../2configs/collectd/collectd-base.nix
   ];
-
   krebs.build.host = config.krebs.hosts.wry;
 
   krebs.Reaktor.enable = true;
@@ -73,5 +73,9 @@ in {
     nameservers = [ "8.8.8.8" ];
   };
 
-  environment.systemPackages = [ pkgs.translate-shell ];
+  # small machine - do not forget to gc every day
+  nix.gc.automatic = true;
+  nix.gc.dates = "03:10";
+
+  environment.systemPackages = [ ];
 }
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 = {
-- 
cgit v1.2.3