* Some refactoring.
svn path=/configurations/trunk/tud/; revision=16968
Eelco Dolstra committed
Sep 6, 2009 at 16:01 UTC
ab29779dd92eacb7e68c4335ad38ab0e620297ec
5 files changed
+59
-95
build-machines-common.nix
new
+36
@@ -0,0 +1,36 @@
1
+{ config, pkgs, ... }:
2
+
3
+{
4
+ boot.grubDevice = "/dev/sda";
5
+ boot.kernelPackages = pkgs.kernelPackages_2_6_29;
6
+ boot.copyKernels = true;
7
+
8
+ boot.postBootCommands =
9
+ ''
10
+ echo 60 > /proc/sys/kernel/panic
11
+ '';
12
+
13
+ fileSystems =
14
+ [ { mountPoint = "/";
15
+ label = "nixos";
16
+ options = "noatime";
17
+ }
18
+ ];
19
+
20
+ swapDevices = [ { label = "swap"; } ];
21
+
22
+ nix.extraOptions =
23
+ ''
24
+ build-max-silent-time = 3600
25
+ '';
26
+
27
+ services.sshd.enable = true;
28
+
29
+ services.cron.systemCronJobs =
30
+ [ "15 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage --max-freed $((32 * 1024**3)) > /var/log/gc.log 2>&1"
31
+ ];
32
+
33
+ networking.hostName = ""; # obtain from DHCP server
34
+
35
+ environment.systemPackages = [pkgs.emacs];
36
+}
\ No newline at end of file
build-machines-dell-1950.nix
+10
-49
@@ -1,60 +1,21 @@
1
# Configuration for the Dell PowerEdge 1950 build machines.
2
3
-{pkgs, config, ...}:
3
+{ config, pkgs, ... }:
4
5
{
6
- boot = {
7
- grubDevice = "/dev/sda";
8
- initrd = {
9
- extraKernelModules = ["uhci_hcd" "ehci_hcd" "ata_piix" "mptsas" "usbhid" "ext4"];
10
- };
11
- kernelModules = ["acpi-cpufreq" "kvm-intel"];
12
- kernelPackages = pkgs.kernelPackages_2_6_29;
13
- copyKernels = true;
6
+ require = [ ./build-machines-common.nix ];
7
15
- postBootCommands = ''
16
- echo 60 > /proc/sys/kernel/panic
17
- '';
18
- };
19
-
20
- fileSystems = [
21
- { mountPoint = "/";
22
- label = "nixos";
23
- options = "noatime";
24
- }
25
- ];
26
-
27
- swapDevices = [
28
- { label = "swap"; }
29
- ];
8
+ boot.initrd.extraKernelModules = ["uhci_hcd" "ehci_hcd" "ata_piix" "mptsas" "usbhid" "ext4"];
9
+ boot.kernelModules = ["acpi-cpufreq" "kvm-intel"];
10
31
- nix = {
32
- maxJobs = 8;
33
- extraOptions = ''
34
- build-max-silent-time = 3600
35
- '';
36
- };
37
-
38
- services = {
39
- sshd = {
40
- enable = true;
41
- };
42
- /*
43
- zabbixAgent = {
44
- enable = true;
45
- server = "192.168.1.5";
46
- };
47
- */
48
- cron = {
49
- systemCronJobs = [
50
- "15 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage --max-freed $((32 * 1024**3)) > /var/log/gc.log 2>&1"
51
- ];
52
- };
53
- };
11
+ nix.maxJobs = 8;
12
55
- networking = {
56
- hostName = ""; # obtain from DHCP server
13
+ /*
14
+ services.zabbixAgent = {
15
+ enable = true;
16
+ server = "192.168.1.5";
17
};
18
+ */
19
20
environment.extraPackages = [pkgs.emacs];
21
}
build-machines-hps.nix
+11
-44
@@ -1,50 +1,17 @@
1
-{pkgs, config, ...}:
1
+# Configuration for the HPS build machines.
2
3
-{
4
- boot = {
5
- grubDevice = "/dev/sda";
6
- initrd = {
7
- extraKernelModules = ["3w_xxxx"];
8
- };
9
- kernelModules = ["kvm-intel"];
10
- kernelPackages = pkgs.kernelPackages_2_6_29;
11
- copyKernels = true;
12
- };
13
-
14
- fileSystems = [
15
- { mountPoint = "/";
16
- label = "nixos";
17
- options = "noatime";
18
- }
19
- ];
20
-
21
- swapDevices = [
22
- { label = "swap"; }
23
- ];
3
+{ config, pkgs, ... }:
4
25
- nix = {
26
- maxJobs = 2;
27
- extraOptions = ''
28
- build-max-silent-time = 3600
29
- '';
30
- };
5
+{
6
+ require = [ ./build-machines-common.nix ];
7
32
- services = {
33
- sshd = {
34
- enable = true;
35
- };
36
- zabbixAgent = {
37
- enable = true;
38
- server = "192.168.1.5";
39
- };
40
- cron = {
41
- systemCronJobs = [
42
- "15 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage --max-atime $(date +\\%s -d '2 weeks ago') > /var/log/gc.log 2>&1"
43
- ];
44
- };
45
- };
8
+ boot.initrd.extraKernelModules = ["3w_xxxx"];
9
+ boot.kernelModules = ["kvm-intel"];
10
47
- networking = {
48
- hostName = ""; # obtain from DHCP server
11
+ nix.maxJobs = 2;
12
+
13
+ services.zabbixAgent = {
14
+ enable = true;
15
+ server = "192.168.1.5";
16
};
17
}
cartman.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{config, pkgs, ...}:
1
+{ config, pkgs, ... }:
2
3
let
4
hydra.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{config, pkgs, ...}:
1
+{ config, pkgs, ... }:
2
3
let
4