From 5822253bc17d0ea380933a8b5382e4f7396ff9e3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 16:32:18 +0200
Subject: m 1 x: add brain-retiolum

---
 makefu/1systems/x.nix                  |  2 +-
 makefu/2configs/git/brain-retiolum.nix | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/git/brain-retiolum.nix

(limited to 'makefu')

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index d1503c8d..ee3a7bb1 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -55,7 +55,7 @@ with import <stockholm/lib>;
       ../2configs/rad1o.nix
 
       # services
-      #../2configs/git/brain-retiolum.nix
+      ../2configs/git/brain-retiolum.nix
       ../2configs/tor.nix
       ../2configs/steam.nix
       # ../2configs/buildbot-standalone.nix
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
new file mode 100644
index 00000000..18275e3d
--- /dev/null
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+# TODO: remove tv lib :)
+with import <stockholm/lib>;
+let
+
+  repos = krebs-repos;
+  rules = concatMap krebs-rules (attrValues krebs-repos);
+
+  krebs-repos = mapAttrs make-krebs-repo {
+    brain = { };
+  };
+
+
+  make-krebs-repo = with git; name: { cgit ? {}, ... }: {
+    inherit cgit name;
+    public = false;
+    hooks = {
+      post-receive = pkgs.git-hooks.irc-announce {
+        nick = config.networking.hostName;
+        verbose = true;
+        channel = "#retiolum";
+        # TODO remove the hardcoded hostname
+        server = "ni.r";
+      };
+    };
+  };
+
+
+
+  # TODO: get the list of all krebsministers
+  krebsminister = with config.krebs.users; [ lass tv ];
+  krebs-rules = repo:
+    set-owners repo [ config.krebs.users.makefu ] ++ set-ro-access repo krebsminister;
+
+  set-ro-access = with git; repo: user:
+      optional repo.public {
+        inherit user;
+        repo = [ repo ];
+        perm = fetch;
+      };
+
+  set-owners = with git;repo: user:
+      singleton {
+        inherit user;
+        repo = [ repo ];
+        perm = push "refs/*" [ non-fast-forward create delete merge ];
+      };
+
+in {
+  krebs.git = {
+    enable = true;
+    cgit = {
+      enable = false;
+    };
+    inherit repos rules;
+  };
+}
-- 
cgit v1.2.3


From 0735ba03d798759b6febb95e9c090aca38809265 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 20:37:35 +0200
Subject: m 2 dirctator: init

---
 makefu/2configs/deployment/dirctator.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 makefu/2configs/deployment/dirctator.nix

(limited to 'makefu')

diff --git a/makefu/2configs/deployment/dirctator.nix b/makefu/2configs/deployment/dirctator.nix
new file mode 100644
index 00000000..14d5918c
--- /dev/null
+++ b/makefu/2configs/deployment/dirctator.nix
@@ -0,0 +1,29 @@
+{ pkgs, lib, ... }:
+
+with lib;
+let
+  port = 18872;
+  runit = pkgs.writeDash "runit" ''
+    set -xeuf
+    export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie
+    echo "$@" | sed 's/^dirctator://' | ${pkgs.espeak}/bin/espeak -v mb-de7 2>&1 | tee -a /tmp/speak
+  '';
+in {
+  services.logstash = {
+    enable = true;
+    inputConfig = ''
+      irc {
+        channels => [ "#krebs", "#afra" ]
+        host => "irc.freenode.net"
+        nick => "dirctator"
+      }
+    '';
+    filterConfig = ''
+    '';
+    outputConfig = ''
+      stdout { codec => rubydebug }
+      exec { command => "${runit} '%{message}" }
+    '';
+    plugins = [ ];
+  };
+}
-- 
cgit v1.2.3


From bda14221cf46003ecf76756a5db7422c70737c85 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 21:50:39 +0200
Subject: m 2 default: bump to f6a2c46

---
 makefu/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 0d61e8de..8038142a 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "a772c3a"; # unstable @ 2017-05-09 + graceful requests2
+          ref = "f6a2c46"; # unstable @ 2017-06-18 + graceful requests2
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
-- 
cgit v1.2.3


From 8a150bcd44d5d32d5c36be7a3cba885d0d1d8b59 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 22:48:40 +0200
Subject: m 2 default: revert to working ref

---
 makefu/2configs/default.nix              | 2 +-
 makefu/2configs/deployment/dirctator.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 8038142a..bcd99882 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "f6a2c46"; # unstable @ 2017-06-18 + graceful requests2
+          ref = "7a7c39c"; # unstable @ 2017-05-09 + graceful requests2 + logstash5
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
diff --git a/makefu/2configs/deployment/dirctator.nix b/makefu/2configs/deployment/dirctator.nix
index 14d5918c..b8e61955 100644
--- a/makefu/2configs/deployment/dirctator.nix
+++ b/makefu/2configs/deployment/dirctator.nix
@@ -10,6 +10,7 @@ let
   '';
 in {
   services.logstash = {
+    package = pkgs.logstash5;
     enable = true;
     inputConfig = ''
       irc {
-- 
cgit v1.2.3