From 5b536e2d311ae6beea7f7e73115c3a061d523a59 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 14:01:19 +0200
Subject: ma irc: ni.r -> irc.r

---
 makefu/1systems/pnp/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix
index 5fbaaabc7..47fa74c00 100644
--- a/makefu/1systems/pnp/config.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -34,7 +34,8 @@
   krebs.Reaktor.debug = {
     debug = true;
     extraEnviron = {
-      REAKTOR_HOST = "ni.r";
+      # TODO: remove hard-coded server
+      REAKTOR_HOST = "irc.r";
     };
     plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ];
     channels = [ "#retiolum" ];
-- 
cgit v1.3.1


From 0fe3f562d7dc66dc4dcf39522fc17ccce6ee30b4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 14:01:48 +0200
Subject: ma cake.r: init

---
 krebs/3modules/makefu/default.nix | 25 +++++++++++++++++++++++++
 makefu/1systems/cake/config.nix   | 20 ++++++++++++++++++++
 makefu/1systems/cake/source.nix   |  3 +++
 3 files changed, 48 insertions(+)
 create mode 100644 makefu/1systems/cake/config.nix
 create mode 100644 makefu/1systems/cake/source.nix

(limited to 'makefu/1systems')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index a34c8cd97..d80935683 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -4,6 +4,31 @@ with import <stockholm/lib>;
 
 {
   hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {
+    cake = rec {
+      cores = 1;
+      ci = false;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.136.236";
+          ip6.addr  = "42:b3b2:9552:eef0:ee67:f3b3:8d33:eee1";
+          aliases = [
+            "cake.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA0khdelSrOV/ZI9vvbV5aT1wVn2IfUfIdDCQIOnF2mZsrnIcuaedu
+            jRfZnJST1vOfL7JksF1+8pYwSn34CjJCGhyFf25lc6mARXmZe/araNrVpTntCy2+
+            MqG8KZe4mIda/WPTXRYGtFVQZeClM5SCZ7EECtw8sEkwt2QtOv43p/hiMXAkOQsq
+            6xc9/b4Bry7d+IjJs3waKfFQllF+C+GuK8yF0YnCEb6GZw7xkxHIO1QV4KSQ4CH7
+            36kEAdCSQ5rgaygRanUlUl+duQn1MLQ+lRlerAEcFfKrr3MKNz2jmGth8iUURdyP
+            MHjSWe+RkLQ6zzBaVgoKKuI9MbIbhenJWwIDAQAB
+            -----END RSA PUBLIC KEY-----
+            '';
+        };
+      };
+      ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyJlI0YpIh/LiiPMseD2IBHg+uVGrkSy0MPNeD+Jv8Y cake";
+    };
     drop = rec {
       ci = true;
       cores = 1;
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
new file mode 100644
index 000000000..0630d19ad
--- /dev/null
+++ b/makefu/1systems/cake/config.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+    imports = [
+        <stockholm/makefu>
+        # configure your hw:
+        # <stockholm/makefu/2configs/hw/CAC.nix>
+        # <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
+        # <stockholm/makefu/2configs/save-diskspace.nix
+    ];
+    krebs = {
+        enable = true;
+        tinc.retiolum.enable = true;
+        build.host = config.krebs.hosts.cake;
+    };
+    # You want to change these :)
+    boot.loader.grub.device = "/dev/sda";
+    fileSystems."/" = {
+        device = "/dev/sda1";
+    };
+}
\ No newline at end of file
diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix
new file mode 100644
index 000000000..797417a1d
--- /dev/null
+++ b/makefu/1systems/cake/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="cake";
+}
\ No newline at end of file
-- 
cgit v1.3.1


From b01385c974dd3f4a9cbf0e7e992e960cd9ebf295 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 14:28:34 +0200
Subject: ma: #retiolum -> #xxx

---
 makefu/1systems/pnp/config.nix         | 2 +-
 makefu/2configs/git/brain-retiolum.nix | 2 +-
 makefu/2configs/git/cgit-retiolum.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix
index 47fa74c00..6c9fc0606 100644
--- a/makefu/1systems/pnp/config.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -38,7 +38,7 @@
       REAKTOR_HOST = "irc.r";
     };
     plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ];
-    channels = [ "#retiolum" ];
+    channels = [ "#xxx" ];
   };
 
   krebs.build.host = config.krebs.hosts.pnp;
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index b913f3056..3be3fccef 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -19,7 +19,7 @@ let
       post-receive = pkgs.git-hooks.irc-announce {
         nick = config.networking.hostName;
         verbose = true;
-        channel = "#retiolum";
+        channel = "#xxx";
         # TODO remove the hardcoded hostname
         server = "irc.r";
       };
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 5d46cabb3..ed890fe40 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -57,7 +57,7 @@ let
       post-receive = pkgs.git-hooks.irc-announce {
         nick = config.networking.hostName;
         verbose = config.krebs.build.host.name == "gum";
-        channel = "#retiolum";
+        channel = "#xxx";
         # TODO remove the hardcoded hostname
         server = "irc.r";
       };
-- 
cgit v1.3.1