Stuff
Eelco Dolstra committed
Jul 25, 2014 at 15:03 UTC
2344ef00a0ee2d86c1f273a2dfbc6f8414e0a1d4
1 file changed
+5
-4
delft/lucifer.nix
+5
-4
@@ -1,7 +1,7 @@
1
{ config, pkgs, ... }:
2
3
{
4
- require = [ ./common.nix ./hydra-module.nix ./megacli.nix ./datadog.nix ];
4
+ require = [ ./common.nix ./hydra-module.nix ./megacli.nix ./datadog.nix ./datadog/hydra.nix ];
5
6
nixpkgs.system = "x86_64-linux";
7
@@ -9,7 +9,7 @@
9
[ pkgs.wget
10
pkgs.perlPackages.DBDSQLite pkgs.perlPackages.NetAmazonS3 pkgs.perlPackages.ForksSuper pkgs.nodePackages.jsontool # for hydra-mirror
11
pkgs.python pkgs.pythonPackages.boto # for upload-binary-cache-s3.py
12
- pkgs.megacli
12
+ pkgs.megacli config.boot.kernelPackages.sysdig
13
];
14
15
networking.hostName = "lucifer";
@@ -19,6 +19,7 @@
19
boot.loader.grub.copyKernels = true;
20
boot.initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "megaraid_sas" "usbhid" ];
21
boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
22
+ boot.extraModulePackages = [config.boot.kernelPackages.sysdig];
23
24
services.hydra.enable = true;
25
services.hydra.logo = ./hydra-logo.png;
@@ -143,7 +144,7 @@
144
script =
145
''
146
rm -rf /data/releases/nixos/13.10/.tmp-*
146
- exec su - hydra-mirror -c 'cd release/channels; while true; do ./mirror-nixos-stable.sh 13.10; sleep 1200; done'
147
+ exec su - hydra-mirror -c 'cd release/channels; while true; do ./mirror-nixos-branch.sh 13.10 release-13.10; sleep 1200; done'
148
'';
149
serviceConfig.Restart = "always";
150
serviceConfig.CPUShares = 100;
@@ -157,7 +158,7 @@
158
script =
159
''
160
rm -rf /data/releases/nixos/14.04/.tmp-*
160
- exec su - hydra-mirror -c 'cd release/channels; while true; do ./mirror-nixos-branch.sh 14.04 release-14.04; sleep 1200; done'
161
+ exec su - hydra-mirror -c 'cd release/channels; while true; do ./mirror-nixos-stable.sh 14.04; sleep 1200; done'
162
'';
163
serviceConfig.Restart = "always";
164
serviceConfig.CPUShares = 100;