@cryptotaxi247 / infra / commits / 1b5ed401

hydra -> hydra-dev

Eelco Dolstra committed Nov 15, 2016 at 14:59 UTC 1b5ed401d5b37d9860c6a9d733a03bc5cc95c5d5
1 file changed +10 -14
delft/hydra.nix
+10 -14
@@ -19,27 +19,23 @@ in
19 users.extraUsers.hydra-queue-runner.openssh.authorizedKeys.keys =
20 with import ../ssh-keys.nix; [ eelco rob provisioner ];
21
22 - services.hydra.enable = true;
23 - services.hydra.buildMachinesFiles =
22 + services.hydra-dev.enable = true;
23 + services.hydra-dev.buildMachinesFiles =
24 [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
25 - services.hydra.package = hydra;
26 - services.hydra.logo = ./hydra-logo.png;
27 - services.hydra.hydraURL = "https://hydra.nixos.org";
28 - services.hydra.notificationSender = "edolstra@gmail.com";
29 - services.hydra.smtpHost = "localhost";
30 - services.hydra.extraConfig =
25 + services.hydra-dev.package = hydra;
26 + services.hydra-dev.logo = ./hydra-logo.png;
27 + services.hydra-dev.hydraURL = "https://hydra.nixos.org";
28 + services.hydra-dev.notificationSender = "edolstra@gmail.com";
29 + services.hydra-dev.smtpHost = "localhost";
30 + services.hydra-dev.useSubstitutes = false;
31 + services.hydra-dev.extraConfig =
32 ''
33 max_servers 50
33 - enable_persona 1
34
35 enable_google_login = 1
36 google_client_id = 816926039128-ia4s4rsqrq998rsevce7i09mo6a4nffg.apps.googleusercontent.com
37
38 - binary_cache_secret_key_file = /var/lib/hydra/queue-runner/keys/cache.nixos.org-1/secret
39 - binary_cache_public_key_file = /var/lib/hydra/queue-runner/keys/cache.nixos.org-1/public
40 -
41 - store_mode = s3-binary-cache
42 - binary_cache_s3_bucket = nix-cache
38 + store_uri = s3://nix-cache?secret-key=/var/lib/hydra/queue-runner/keys/cache.nixos.org-1/secret&write-nar-listing=1
39 binary_cache_public_uri = https://cache.nixos.org
40
41 <hipchat>