Fix sending email
Eelco Dolstra committed
Apr 7, 2016 at 18:29 UTC
dc533b900cc3c24cbe1300e0727eeaf2b1b51588
2 files changed
+7
-2
delft/chef.nix
+2
@@ -45,4 +45,6 @@
45
nix.gc.automatic = true;
46
nix.gc.options = ''--max-freed "$((50 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
47
48
+ networking.defaultMailServer.directDelivery = lib.mkForce false;
49
+ services.postfix.enable = true;
50
}
delft/hydra.nix
+5
-2
@@ -3,12 +3,13 @@
3
with lib;
4
5
let
6
- hydra = (import ../../hydra/release.nix {}).build.x86_64-linux;
6
+ hydraSrc = ../../hydra;
7
+ hydra = (import (hydraSrc + "/release.nix") {}).build.x86_64-linux;
8
in
9
10
{
11
imports =
11
- [ "${hydra}/share/nix/hydra-module.nix"
12
+ [ (hydraSrc + "/hydra-module.nix")
13
];
14
15
users.extraUsers.hydra.openssh.authorizedKeys.keys =
@@ -25,6 +26,7 @@ in
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 =
31
''
32
max_servers 50
@@ -55,6 +57,7 @@ in
57
58
systemd.services.hydra-queue-runner.restartIfChanged = false;
59
systemd.services.hydra-queue-runner.wantedBy = mkForce [];
60
+ systemd.services.hydra-queue-runner.requires = mkForce [];
61
62
programs.ssh.extraConfig = mkAfter
63
''