svn path=/configurations/trunk/tud/; revision=20553
svn path=/configurations/trunk/tud/; revision=20553
Eelco Dolstra committed
Mar 11, 2010 at 11:40 UTC
8410cdf80325d0ed3c304b971660a22c700c6193
2 files changed
+8
-3
build-machines-common.nix
+5
-1
@@ -2,6 +2,8 @@
2
3
{
4
require = [ ./common.nix ];
5
+
6
+ environment.nix = pkgs.nixSqlite;
7
8
boot.grubDevice = "/dev/sda";
9
boot.kernelPackages = pkgs.linuxPackages_2_6_32;
@@ -10,6 +12,7 @@
12
fileSystems =
13
[ { mountPoint = "/";
14
label = "nixos";
15
+ options = "noatime";
16
}
17
];
18
@@ -21,7 +24,8 @@
24
'';
25
26
services.cron.systemCronJobs =
24
- [ "15 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage --max-freed $((32 * 1024**3)) > /var/log/gc.log 2>&1"
27
+ [ # Make sure that at least 100 GiB of disk space is available.
28
+ "15 03 * * * root nix-store --gc --max-freed \"$((100 * 1024**3 - 1024 * $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
29
];
30
31
networking.hostName = ""; # obtain from DHCP server
hydra.nix
+3
-2
@@ -31,6 +31,7 @@ in
31
fileSystems =
32
[ { mountPoint = "/";
33
label = "nixos";
34
+ options = "noatime,barrier=0";
35
}
36
];
37
@@ -74,8 +75,8 @@ in
75
76
services.cron.systemCronJobs =
77
[ "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"
77
- # Make sure that at least 100 GiB of disk space is available.
78
- "15 03 * * * root nix-store --gc --max-freed \"$((250 * 1024**3 - 1024 * $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
78
+ # Make sure that at least 200 GiB of disk space is available.
79
+ "15 03 * * * root nix-store --gc --max-freed \"$((200 * 1024**3 - 1024 * $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
80
];
81
82
jobs.hydra_server =