svn path=/configurations/trunk/tud/; revision=24954
svn path=/configurations/trunk/tud/; revision=24954
Eelco Dolstra committed
Dec 2, 2010 at 16:53 UTC
64120086965a0f0449b02620ffecdd6cf8024898
3 files changed
+15
-3
cartman.nix
+4
-1
@@ -4,7 +4,7 @@ with pkgs.lib;
4
5
let
6
7
- machines = import ./machines.nix;
7
+ machines = import ./machines.nix pkgs.lib;
8
9
# Produce the list of Nix build machines in the format expected by
10
# the Nix daemon Upstart job.
@@ -105,6 +105,9 @@ rec {
105
# stan ssh (for the SCM seminar)
106
iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 2222 -j DNAT --to 192.168.1.20:22
107
108
+ # lucifer ssh (to give Karl/Armijn access for the BAT project)
109
+ iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 22222 -j DNAT --to 192.168.1.25:22
110
+
111
echo 1 > /proc/sys/net/ipv4/ip_forward
112
'';
113
};
hydra.nix
+1
-1
@@ -2,7 +2,7 @@
2
3
let
4
5
- machines = import ./machines.nix;
5
+ machines = import ./machines.nix pkgs.lib;
6
7
# Produce the list of Nix build machines in the format expected by
8
# the Nix daemon Upstart job.
flip map (range 0 9) (nr:
renamed
+10
-1
@@ -1,3 +1,5 @@
1
+lib: with lib;
2
+
3
[
4
{
5
hostName = "cartman";
@@ -181,5 +183,13 @@
183
ethernetAddress = "00:16:3e:00:00:05";
184
systems = [ "i686-linux" ];
185
}
184
-
186
]
187
+
188
+# Machines for the agilecloud experiment.
189
+ { hostName = "agilecloud0${toString nr}";
190
+ ipAddress = "192.168.1.${toString (builtins.add nr 80)}";
191
+ ethernetAddress = "00:16:3e:00:34:0${toString nr}";
192
+ systems = [ "i686-linux" ];
193
+ }
194
+)