Re-enable hydra-test
Eelco Dolstra committed
Sep 4, 2013 at 14:30 UTC
a78183719c037c51ef9b5862bb5a2fd16c5d1e80
2 files changed
+6
-4
delft/delft-webserver.nix
+2
-4
@@ -219,7 +219,6 @@ in
219
'';
220
}
221
222
- /*
222
{ hostName = "hydra-test.nixos.org";
223
logFormat = ''"%h %l %u %t \"%r\" %>s %b %D"'';
224
extraConfig = ''
@@ -230,11 +229,10 @@ in
229
230
ProxyRequests Off
231
ProxyPreserveHost On
233
- ProxyPass / http://wendy:4000/ retry=5 disablereuse=off
234
- ProxyPassReverse / http://wendy:4000/
232
+ ProxyPass / http://lucifer:4000/ retry=5 disablereuse=off
233
+ ProxyPassReverse / http://lucifer:4000/
234
'';
235
}
237
- */
236
237
{ hostName = "planet.strategoxt.org";
238
serverAliases = ["planet.stratego.org"];
delft/wendy.nix
+4
@@ -1,10 +1,14 @@
1
{ config, pkgs, ... }:
2
+
3
with pkgs.lib;
4
+
5
let
6
+
7
myIP = "130.161.158.181";
8
machines = import ./machines.nix pkgs.lib;
9
10
in
11
+
12
{
13
require = [ ./build-machines-dell-r815.nix ./delft-webserver.nix ./sysstat.nix];
14