From 6788519e4be7390c76bffacadd05d49f8fc3cace Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Feb 2019 15:17:23 +0100
Subject: ma x: enable remote builder

---
 makefu/1systems/x/config.nix           | 27 +++++++++++++++++----------
 makefu/2configs/remote-build/gum.nix   | 15 +++++++++++++++
 makefu/2configs/remote-build/slave.nix |  1 +
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 makefu/2configs/remote-build/gum.nix

(limited to 'makefu')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 138735d9..7ed63837 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -15,6 +15,13 @@
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
       <stockholm/makefu/2configs/dict.nix>
+      #<stockholm/makefu/3modules/netboot_server.nix>
+      #{
+      #  netboot_server = {
+      #    network.wan = "wlp3s0";
+      #    network.lan = "enp0s25";
+      #  };
+      #}
 
       <stockholm/makefu/2configs/backup/state.nix>
       # <stockholm/makefu/2configs/dnscrypt/client.nix>
@@ -52,21 +59,22 @@
       # Virtualization
       <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
-      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
-      {
-        networking.firewall.allowedTCPPorts = [ 8080 ];
-        networking.nat = {
-          enable = true;
-          externalInterface = "wlp3s0";
-          internalInterfaces = [ "vboxnet0" ];
-        };
-      }
+      # <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+      #{
+      #  networking.firewall.allowedTCPPorts = [ 8080 ];
+      #  networking.nat = {
+      #    enable = true;
+      #    externalInterface = "wlp3s0";
+      #    internalInterfaces = [ "vboxnet0" ];
+      #  };
+      #}
       # Services
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
       <stockholm/makefu/2configs/vpn/vpngate.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
       <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
+      <stockholm/makefu/2configs/remote-build/gum.nix>
 
       # Hardware
       <stockholm/makefu/2configs/hw/tp-x230.nix>
@@ -162,7 +170,6 @@
     "/home/makefu/docs"
     "/home/makefu/.password-store"
     "/home/makefu/.secrets-pass"
-    "/home/makefu/autosync/Database.kdb"
   ];
 
   services.syncthing.user = lib.mkForce "makefu";
diff --git a/makefu/2configs/remote-build/gum.nix b/makefu/2configs/remote-build/gum.nix
new file mode 100644
index 00000000..98e2e58b
--- /dev/null
+++ b/makefu/2configs/remote-build/gum.nix
@@ -0,0 +1,15 @@
+{
+  nix = {
+    distributedBuilds = true;
+    buildMachines = [
+      {
+        hostName = "gum.krebsco.de";
+        maxJobs = 8;
+        sshKey = toString <secrets/id_nixBuild>;
+        sshUser = "nixBuild";
+        system = "x86_64-linux";
+        supportedFeatures = [ ];
+      }
+    ];
+  };
+}
diff --git a/makefu/2configs/remote-build/slave.nix b/makefu/2configs/remote-build/slave.nix
index 89121ffd..0227f512 100644
--- a/makefu/2configs/remote-build/slave.nix
+++ b/makefu/2configs/remote-build/slave.nix
@@ -5,6 +5,7 @@
       useDefaultShell = true;
       openssh.authorizedKeys.keys = [
         config.krebs.users.buildbotSlave.pubkey
+        config.krebs.users.makefu-remote-builder.pubkey
       ];
     };
 }
-- 
cgit v1.2.3