* Add some machines.
svn path=/configurations/trunk/tud/; revision=30512
Eelco Dolstra committed
Nov 21, 2011 at 15:45 UTC
7f564d12e67dca3544d96cc38399bc674fa0424b
2 files changed
+22
-29
cartman.nix
+1
@@ -29,6 +29,7 @@ let
29
{ hostName = "nixos.org";
30
serverAliases = [ "ipv6.nixos.org" ];
31
documentRoot = "/home/eelco/nix-homepage";
32
+ enableUserDir = true;
33
servedDirs =
34
[ { urlPath = "/tarballs";
35
dir = "/data/webserver/tarballs";
machines.nix
+21
-29
@@ -49,16 +49,6 @@ lib: with lib;
49
buildUser = "nix";
50
}
51
52
- {
53
- hostName = "phillip";
54
- ipAddress = "192.168.1.13";
55
- ethernetAddress = "00:19:d1:19:2a:31";
56
- system = "i686-freebsd";
57
- aliases = ["freebsd-1"];
58
- maxJobs = 2;
59
- buildUser = "buildfarm";
60
- }
61
-
52
{ # 64-bit Mac OS X build machine.
53
hostName = "butters";
54
ipAddress = "192.168.1.23";
@@ -91,12 +81,12 @@ lib: with lib;
81
# The following are Xen VMs hosted on mrhankey.
82
# Note that 00:16:3e is the prefix for Xen MAC addresses.
83
94
- { # OpenSolaris 2009.06 (32 bit).
84
+ { # 32-bit OpenIndiana 151a (in a VM).
85
hostName = "tweek";
86
ipAddress = "192.168.1.50";
87
ethernetAddress = "00:16:3e:00:00:01";
98
- systems = [ "i386-sunos" ];
99
- maxJobs = 2;
88
+ systems = [ "i686-solaris" ];
89
+ maxJobs = 1;
90
}
91
92
{ # NixOS test machine.
@@ -135,6 +125,24 @@ lib: with lib;
125
systems = [ "x86_64-linux" ];
126
}
127
128
+ { # 64-bit FreeBSD build machine (in a VM).
129
+ hostName = "beastie";
130
+ ipAddress = "192.168.1.56";
131
+ ethernetAddress = "00:16:3e:00:00:07";
132
+ system = "x86_64-freebsd";
133
+ maxJobs = 1;
134
+ buildUser = "buildfarm";
135
+ }
136
+
137
+ { # 32-bit FreeBSD build machine (in a VM).
138
+ hostName = "demon";
139
+ ipAddress = "192.168.1.57";
140
+ ethernetAddress = "00:16:3e:00:00:08";
141
+ system = "i686-freebsd";
142
+ maxJobs = 1;
143
+ buildUser = "buildfarm";
144
+ }
145
+
146
{ # 48 core powerrrr
147
hostName = "wendy";
148
ipAddress = "192.168.1.26";
@@ -155,19 +163,3 @@ lib: with lib;
163
}
164
165
]
158
-
159
-# Machines for the agilecloud experiment.
160
-++ flip map (range 0 9) (nr:
161
- { hostName = "agilecloud0${toString nr}";
162
- ipAddress = "192.168.1.${toString (builtins.add nr 80)}";
163
- ethernetAddress = "00:16:3e:00:34:0${toString nr}";
164
- systems = [ "i686-linux" ];
165
- }
166
-)
167
-++ flip map (range 10 29) (nr:
168
- { hostName = "agilecloud${toString nr}";
169
- ipAddress = "192.168.1.${toString (builtins.add nr 80)}";
170
- ethernetAddress = "00:16:3e:00:34:${toString nr}";
171
- systems = [ "i686-linux" ];
172
- }
173
-)