@cryptotaxi247 / infra / commits / fe20773f

* Use nixos-deploy-network.

svn path=/configurations/trunk/tud/; revision=24957

Eelco Dolstra committed Dec 2, 2010 at 18:13 UTC fe20773fea54a1a655837c5b815f7f20cb0e6bda
3 files changed +14 -17
cartman.nix
+2
@@ -30,6 +30,8 @@ in
30 rec {
31 require = [ ./common.nix ];
32
33 + environment.nix = pkgs.nixSqlite;
34 +
35 boot = {
36 loader.grub.device = "/dev/sda";
37 loader.grub.copyKernels = true;
infrastructure.nix
+11 -15
@@ -1,39 +1,35 @@
1 {
2 # !!! should be merged with machines.nix
3 - terrance =
4 - { hostName = "terrance";
5 - system = "x86_64-linux";
6 - };
7 - phillip =
8 - { hostName = "phillip";
9 - system = "x86_64-linux";
10 - };
3 jimmy =
12 - { hostName = "jimmy";
4 + { hostname = "jimmy";
5 system = "i686-linux";
6 };
7 timmy =
16 - { hostName = "timmy";
8 + { hostname = "timmy";
9 system = "i686-linux";
10 };
11 kenny =
20 - { hostName = "kenny";
12 + { hostname = "kenny";
13 system = "x86_64-linux";
14 };
15 stan =
24 - { hostName = "stan";
16 + { hostname = "stan";
17 system = "x86_64-linux";
18 };
19 kyle =
28 - { hostName = "kyle";
20 + { hostname = "kyle";
21 system = "x86_64-linux";
22 };
23 cartman =
32 - { hostName = "cartman";
24 + { hostname = "cartman";
25 system = "i686-linux";
26 };
27 hydra =
36 - { hostName = "hydra";
28 + { hostname = "hydra";
29 + system = "x86_64-linux";
30 + };
31 + lucifer =
32 + { hostname = "lucifer";
33 system = "x86_64-linux";
34 };
35 }
network.nix
+1 -2
@@ -1,6 +1,4 @@
1 {
2 - terrance = import ./build-machines-hps.nix;
3 - phillip = import ./build-machines-hps.nix;
2 jimmy = import ./build-machines-hps.nix;
3 timmy = import ./build-machines-hps.nix;
4 kenny = import ./build-machines-dell-1950.nix;
@@ -8,4 +6,5 @@
6 kyle = import ./build-machines-dell-1950.nix;
7 cartman = import ./cartman.nix;
8 hydra = import ./hydra.nix;
9 + lucifer = import ./lucifer.nix;
10 }