Merge remote-tracking branch 'gum/master'

5 files changed, 50 insertions, 3 deletions

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 0a103ed1a..91071ec85 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -6,7 +6,6 @@
     ../../../krebs/2configs
     ../../../krebs/2configs/nginx.nix
 
-    ../../../krebs/2configs/buildbot-stockholm.nix
     ../../../krebs/2configs/binary-cache/nixos.nix
     ../../../krebs/2configs/ircd.nix
     ../../../krebs/2configs/reaktor2.nix
@@ -15,6 +14,10 @@
     ../../../krebs/2configs/mud.nix
     ../../../krebs/2configs/repo-sync.nix
 
+    ../../../krebs/2configs/buildbot-stockholm.nix
+    #../../../krebs/2configs/buildbot/master.nix
+    #../../../krebs/2configs/buildbot/worker.nix
+
     ../../../krebs/2configs/cal.nix
     ../../../krebs/2configs/mastodon.nix
 
diff --git a/krebs/2configs/buildbot/master.nix b/krebs/2configs/buildbot/master.nix
new file mode 100644
index 000000000..9598f6fa0
--- /dev/null
+++ b/krebs/2configs/buildbot/master.nix
@@ -0,0 +1,33 @@
+{buildbot-nix,...}:
+let
+  #domain = "buildbot.krebsco.de";
+  domain = "build.hotdog.r";
+in {
+  imports = [
+    buildbot-nix.nixosModules.buildbot-master
+  ];
+
+  #services.nginx.virtualHosts."${domain}" = {
+  #  enableACME = true;
+  #  forceSSL = true;
+  #};
+
+
+  services.buildbot-nix.master = {
+    enable = true;
+    admins = [ "makefu" ];
+    buildSystems = [ "x86_64-linux" "aarch64-linux" ];
+    inherit domain;
+    evalMaxMemorySize = "4096";
+    evalWorkerCount = 16;
+    workersFile = "/var/src/secrets/buildbot/nix-workers";
+    github = {
+      tokenFile = "/var/src/secrets/buildbot/github-token";
+      webhookSecretFile = "/var/src/secrets/buildbot/github-webhook-secret";
+      oauthSecretFile = "/var/src/secrets/buildbot/github-oauth-secret";
+      oauthId = "Ov23lizFP7t7qoE9FuDA";
+      user = "krebs-bob";
+      topic = "buildbot";
+    };
+  };
+}
diff --git a/krebs/2configs/buildbot/worker.nix b/krebs/2configs/buildbot/worker.nix
new file mode 100644
index 000000000..e96c6df14
--- /dev/null
+++ b/krebs/2configs/buildbot/worker.nix
@@ -0,0 +1,11 @@
+{ buildbot-nix, ... }:
+{
+  imports = [
+    buildbot-nix.nixosModules.buildbot-worker
+  ];
+
+  services.buildbot-nix.worker = {
+    enable = true;
+    workerPasswordFile = "/var/src/secrets/nix-worker-file";
+  };
+}
diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix
index 5d64555c8..6ca7c732a 100644
--- a/krebs/2configs/default.nix
+++ b/krebs/2configs/default.nix
@@ -28,7 +28,7 @@ with import ../../lib/pure.nix { inherit lib; };
   networking.hostName = config.krebs.build.host.name;
 
   nix.maxJobs = 1;
-  nix.useSandbox = true;
+  nix.settings.sandbox = true;
 
   environment.systemPackages = with pkgs; [
     git
diff --git a/krebs/2configs/matterbridge.nix b/krebs/2configs/matterbridge.nix
index f42921824..aa33f748f 100644
--- a/krebs/2configs/matterbridge.nix
+++ b/krebs/2configs/matterbridge.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ...  }: {
+{ pkgs, lib, config, ...  }: {
   services.matterbridge = {
     enable = true;
     configPath = let