summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-13 11:15:05 +0200
committertv <tv@krebsco.de>2017-04-13 11:15:05 +0200
commitbcbf11a57cd399cd6e0d707401f8f1cfb0d50eea (patch)
treeb2c42263bead615b4264c453d392edcf08025f7e /lass/2configs
parent79bcfa03edcf7eaeb69515c99af7522f893665f4 (diff)
parent22edcfcb72dc0b728a96ab92ecca8944b81c13d0 (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/buildbot-standalone.nix13
-rw-r--r--lass/2configs/default.nix2
2 files changed, 13 insertions, 2 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 2bd3e9914..3006e9dfb 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -10,6 +10,15 @@ let
'';
in {
+ config.services.nginx.virtualHosts.build = {
+ serverAliases = [ "build.prism.r" ];
+ locations."/".extraConfig = ''
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ proxy_pass http://localhost:${toString config.krebs.buildbot.master.web.port};
+ '';
+ };
+
config.krebs.buildbot.master = let
stockholm-mirror-url = http://cgit.lassul.us/stockholm ;
in {
@@ -219,6 +228,9 @@ in {
channels = [ { channel = "retiolum"; } { channel = "noise"; } ];
allowForce = true;
};
+ extraConfig = ''
+ c['buildbotURL'] = "http://build.prism.r/"
+ '';
};
config.krebs.buildbot.worker = {
@@ -234,7 +246,6 @@ in {
config.krebs.iptables = {
tables = {
filter.INPUT.rules = [
- { predicate = "-p tcp --dport 8010"; target = "ACCEPT"; }
{ predicate = "-p tcp --dport 9989"; target = "ACCEPT"; }
];
};
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index b747ccb39..69f8a681e 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -76,7 +76,7 @@ with import <stockholm/lib>;
krebs = {
enable = true;
- search-domain = "retiolum";
+ search-domain = "r";
build = {
user = config.krebs.users.lass;
source = let inherit (config.krebs.build) host; in {