From 0aced4798237fb80690f13ea49922ad45762c91f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 22 Jul 2017 14:50:01 +0200
Subject: krebs buildbot: hostname agnostic

---
 krebs/2configs/shared-buildbot.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'krebs/2configs/shared-buildbot.nix')

diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix
index dd430b7c0..99710070a 100644
--- a/krebs/2configs/shared-buildbot.nix
+++ b/krebs/2configs/shared-buildbot.nix
@@ -1,16 +1,18 @@
 { lib, config, pkgs, ... }:
-# The buildbot config is self-contained and currently provides a way 
+# The buildbot config is self-contained and currently provides a way
 # to test "krebs" configuration (infrastructure to be used by every krebsminister).
 
 # You can add your own test, test steps as required. Deploy the config on a
 # krebs host like wolf and everything should be fine.
 
 # TODO for all users schedule a build for fast tests
-{
+let
+  hostname = config.networking.hostName;
+in {
   # due to the fact that we actually build stuff on the box via the daemon,
   # /nix/store should be cleaned up automatically as well
   services.nginx.virtualHosts.build = {
-    serverAliases = [ "build.wolf.r" ];
+    serverAliases = [ "build.${hostname}.r" ];
     locations."/".extraConfig = ''
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -22,7 +24,7 @@
   nix.gc.dates = "05:23";
   networking.firewall.allowedTCPPorts = [ 8010 9989 ];
   krebs.buildbot.master = let
-    stockholm-mirror-url = http://cgit.wolf.r/stockholm-mirror ;
+    stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm" ;
   in {
     secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
     workers = {
@@ -155,13 +157,13 @@
     };
     irc = {
       enable = true;
-      nick = "wolfbot";
+      nick = "${hostname}bot";
       server = "ni.r";
       channels = [ { channel = "retiolum"; } ];
       allowForce = true;
     };
     extraConfig = ''
-      c['buildbotURL'] = "http://build.wolf.r/"
+      c['buildbotURL'] = "http://build.${hostname}.r/"
     '';
   };
 
@@ -173,6 +175,6 @@
     packages = with pkgs; [ gnumake jq nix populate ];
     # all nix commands will need a working nixpkgs installation
     extraEnviron = {
-      NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/wolf/config.nix:stockholm=./"; };
+      NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/${hostname}/config.nix:stockholm=./"; };
   };
 }
-- 
cgit v1.2.3


From 248d405f6171e134812a4cbd51b3fa2663e616b0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 22 Jul 2017 14:52:51 +0200
Subject: krebs buildbot: start nginx by default

---
 krebs/2configs/shared-buildbot.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'krebs/2configs/shared-buildbot.nix')

diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix
index 99710070a..135fcd65a 100644
--- a/krebs/2configs/shared-buildbot.nix
+++ b/krebs/2configs/shared-buildbot.nix
@@ -11,18 +11,21 @@ let
 in {
   # due to the fact that we actually build stuff on the box via the daemon,
   # /nix/store should be cleaned up automatically as well
-  services.nginx.virtualHosts.build = {
-    serverAliases = [ "build.${hostname}.r" ];
-    locations."/".extraConfig = ''
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_pass http://127.0.0.1:${toString config.krebs.buildbot.master.web.port};
-    '';
+  services.nginx = {
+    enable = true;
+    virtualHosts.build = {
+      serverAliases = [ "build.${hostname}.r" ];
+      locations."/".extraConfig = ''
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://127.0.0.1:${toString config.krebs.buildbot.master.web.port};
+      '';
+    };
   };
 
   nix.gc.automatic = true;
   nix.gc.dates = "05:23";
-  networking.firewall.allowedTCPPorts = [ 8010 9989 ];
+  networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
   krebs.buildbot.master = let
     stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm" ;
   in {
-- 
cgit v1.2.3


From 8243e53d893c22e9fd4fc852df30e6f2f3cae032 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 22 Jul 2017 14:54:57 +0200
Subject: krebs buildbot: remove deprecated secrets

---
 krebs/2configs/shared-buildbot.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'krebs/2configs/shared-buildbot.nix')

diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix
index 135fcd65a..a9e5afc75 100644
--- a/krebs/2configs/shared-buildbot.nix
+++ b/krebs/2configs/shared-buildbot.nix
@@ -29,7 +29,6 @@ in {
   krebs.buildbot.master = let
     stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm" ;
   in {
-    secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
     workers = {
       testworker =  "krebspass";
     };
-- 
cgit v1.2.3