From 9c49d9a4396099653ca417cadf0208987de1a779 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 12:15:15 +0200 Subject: l 2 buildbot: use prism.r --- lass/2configs/buildbot-standalone.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs/buildbot-standalone.nix') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 2bd3e9914..44ee37ca9 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -219,6 +219,9 @@ in { channels = [ { channel = "retiolum"; } { channel = "noise"; } ]; allowForce = true; }; + extraConfig = '' + c['buildbotURL'] = "http://${config.networking.hostName}.r:${toString config.krebs.buildbot.master.web.port}/" + ''; }; config.krebs.buildbot.worker = { -- cgit v1.2.3 From 894192ea104a0d7e84db848afdf2c1fe12b72d21 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 21:05:18 +0200 Subject: l 2 buildbot: change buildbotURL to build.prism.r --- lass/2configs/buildbot-standalone.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lass/2configs/buildbot-standalone.nix') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 44ee37ca9..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 { @@ -220,7 +229,7 @@ in { allowForce = true; }; extraConfig = '' - c['buildbotURL'] = "http://${config.networking.hostName}.r:${toString config.krebs.buildbot.master.web.port}/" + c['buildbotURL'] = "http://build.prism.r/" ''; }; @@ -237,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"; } ]; }; -- cgit v1.2.3