Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
ce0cef9806
|
@ -57,6 +57,8 @@ let
|
||||||
syslog_timestamp = false
|
syslog_timestamp = false
|
||||||
syslog_duplication = false
|
syslog_duplication = false
|
||||||
|
|
||||||
|
tls_advertise_hosts =
|
||||||
|
|
||||||
begin acl
|
begin acl
|
||||||
|
|
||||||
acl_check_rcpt:
|
acl_check_rcpt:
|
||||||
|
|
|
@ -60,7 +60,9 @@ rec {
|
||||||
inherit text;
|
inherit text;
|
||||||
passAsFile = [ "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
|
mv "$textPath" $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user