svn path=/configurations/trunk/tud/; revision=20037
svn path=/configurations/trunk/tud/; revision=20037
Eelco Dolstra committed
Feb 16, 2010 at 01:02 UTC
bcf5b51e517a800aab89e6f4f0e0a65d40504f22
8 files changed
+19
-18
build-db-dell-R410.nix
+1
-1
@@ -87,7 +87,7 @@
87
######## copied from common ###########
88
89
boot.grubDevice = "/dev/sda";
90
- boot.kernelPackages = pkgs.kernelPackages_2_6_29;
90
+ boot.kernelPackages = pkgs.linuxPackages_2_6_29;
91
boot.copyKernels = true;
92
93
swapDevices = [ { label = "swap"; } ];
build-machines-common.nix
+1
-1
@@ -4,7 +4,7 @@
4
require = [ ./common.nix ];
5
6
boot.grubDevice = "/dev/sda";
7
- boot.kernelPackages = pkgs.kernelPackages_2_6_32;
7
+ boot.kernelPackages = pkgs.linuxPackages_2_6_32;
8
boot.copyKernels = true;
9
10
fileSystems =
build-machines-dell-1950.nix
-7
@@ -10,12 +10,5 @@
10
11
nix.maxJobs = 8;
12
13
- /*
14
- services.zabbixAgent = {
15
- enable = true;
16
- server = "192.168.1.5";
17
- };
18
- */
19
-
13
environment.extraPackages = [pkgs.emacs];
14
}
build-machines-hps.nix
-5
@@ -9,9 +9,4 @@
9
boot.kernelModules = ["kvm-intel"];
10
11
nix.maxJobs = 2;
12
-
13
- services.zabbixAgent = {
14
- enable = true;
15
- server = "192.168.1.5";
16
- };
12
}
cartman.nix
+1
-1
@@ -32,7 +32,7 @@ rec {
32
extraKernelModules = ["arcmsr"];
33
};
34
kernelModules = ["kvm-intel"];
35
- kernelPackages = pkgs.kernelPackages_2_6_27;
35
+ kernelPackages = pkgs.linuxPackages_2_6_27;
36
copyKernels = true;
37
};
38
common.nix
+3
@@ -16,4 +16,7 @@
16
''
17
fsync-metadata = true
18
'';
19
+
20
+ services.zabbixAgent.enable = true;
21
+ services.zabbixAgent.server = "192.168.1.5";
22
}
hydra.nix
+11
-1
@@ -23,7 +23,7 @@ in
23
extraKernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "mptsas" "usbhid" "ext4" ];
24
};
25
kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
26
- kernelPackages = pkgs.kernelPackages_2_6_32;
26
+ kernelPackages = pkgs.linuxPackages_2_6_32;
27
grubDevice = "/dev/sda";
28
copyKernels = true;
29
};
@@ -74,6 +74,16 @@ in
74
};
75
76
services = {
77
+ httpd.enable = true;
78
+ httpd.adminAddr = "rob.vermaas@gmail.com";
79
+
80
+ systemhealth = {
81
+ enable = true;
82
+ interfaces = [ "lo" "eth0" ];
83
+ drives = [
84
+ { name = "root"; path = "/"; }
85
+ ];
86
+ };
87
88
cron.systemCronJobs =
89
[ "15 02 * * * hydra source /home/hydra/.bashrc; /nix/var/nix/profiles/per-user/hydra/profile/bin/hydra_update_gc_roots.pl > /home/hydra/gc-roots.log 2>&1"
machines.nix
+2
-2
@@ -46,7 +46,7 @@
46
maxJobs = 2;
47
buildUser = "nix";
48
}
49
-
49
+
50
{
51
hostName = "terrance";
52
ipAddress = "192.168.1.12";
@@ -56,7 +56,7 @@
56
maxJobs = 2;
57
buildUser = "buildfarm";
58
}
59
-
59
+
60
{
61
hostName = "phillip";
62
ipAddress = "192.168.1.13";