svn path=/configurations/trunk/tud/; revision=27509
svn path=/configurations/trunk/tud/; revision=27509
Eelco Dolstra committed
Jun 21, 2011 at 09:51 UTC
99ac7a68e53e1cab4dac627b83e52f240879d91a
3 files changed
+40
-3
cartman.nix
+18
@@ -117,6 +117,9 @@ rec {
117
118
# Create a local network (prefix:1::/64).
119
ip -6 addr add 2001:610:685:1::1/64 dev eth0
120
+
121
+ # Forward traffic to our Nova cloud to "stan".
122
+ ip -6 route add 2001:610:685:2::/64 via 2001:610:685:1:222:19ff:fe55:bf2e
123
'';
124
};
125
@@ -470,6 +473,21 @@ rec {
473
ProxyPassReverse / http://stan:8773/
474
'';
475
}
476
+
477
+ { hostName = "vnc.nixos.org";
478
+ extraConfig = ''
479
+ <Proxy *>
480
+ Order deny,allow
481
+ Allow from all
482
+ </Proxy>
483
+
484
+ ProxyRequests Off
485
+ ProxyPreserveHost On
486
+ ProxyPass / http://stan:6080/ retry=5
487
+ ProxyPassReverse / http://stan:6080/
488
+ '';
489
+ }
490
+
491
];
492
};
493
machines.nix
+19
@@ -190,6 +190,25 @@ lib: with lib;
190
ethernetAddress = "00:16:3e:00:00:06";
191
systems = [ "x86_64-linux" ];
192
}
193
+
194
+ { # 48 core powerrrr
195
+ hostName = "wendy";
196
+ ipAddress = "192.168.1.26";
197
+ ethernetAddress = "f0:4d:a2:40:1b:be";
198
+ systems = [ "x86_64-linux" ];
199
+ }
200
+ { # 48 core powerrrr
201
+ hostName = "ike";
202
+ ipAddress = "192.168.1.27";
203
+ ethernetAddress = "f0:4d:a2:40:1b:91";
204
+ systems = [ "x86_64-linux" ];
205
+ }
206
+ { # 48 core powerrrr
207
+ hostName = "shelley";
208
+ ipAddress = "192.168.1.28";
209
+ ethernetAddress = "f0:4d:a2:40:10:6c";
210
+ systems = [ "x86_64-linux" ];
211
+ }
212
213
]
214
network.nix
+3
-3
@@ -2,11 +2,11 @@
2
jimmy = import ./build-machines-hps.nix;
3
timmy = import ./build-machines-hps.nix;
4
kenny = import ./build-machines-dell-1950.nix;
5
- #stan = import ./build-machines-dell-1950.nix;
5
kyle = import ./build-machines-dell-1950.nix;
6
+ stan = import ./stan.nix;
7
cartman = import ./cartman.nix;
8
hydra = import ./hydra.nix;
9
lucifer = import ./lucifer.nix;
10
- mrkitty = import ./mrkitty.nix;
11
- mrhankey = import ./mrhankey.nix;
10
+ #mrkitty = import ./mrkitty.nix;
11
+ #mrhankey = import ./mrhankey.nix;
12
}