Merge remote-tracking branch 'cd/master'

This commit is contained in:
lassulus 2016-05-24 22:49:52 +02:00
commit ce0cef9806
2 changed files with 5 additions and 1 deletions

View File

@ -57,6 +57,8 @@ let
syslog_timestamp = false
syslog_duplication = false
tls_advertise_hosts =
begin acl
acl_check_rcpt:

View File

@ -60,7 +60,9 @@ rec {
inherit text;
passAsFile = [ "text" ];
} ''
${pkgs.exim}/bin/exim -C "$textPath" -bV >/dev/null
# TODO validate exim config even with config.nix.useChroot == true
# currently doing so will fail because "user exim was not found"
#${pkgs.exim}/bin/exim -C "$textPath" -bV >/dev/null
mv "$textPath" $out
'';