diff options
| author | lassulus <lass@aidsballs.de> | 2016-05-24 22:49:52 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-05-24 22:49:52 +0200 |
| commit | ce0cef98067269a04dd864a1481abd0af5f14f16 (patch) | |
| tree | cbf1225eb2d288cfb3aacabc949a78a71068071a /krebs | |
| parent | 5691537512d24aa542c7ae2d9225c46712e1e811 (diff) | |
| parent | 2ccafac558ed89915fc595c82679f55c3417e9cd (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/exim-retiolum.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/builders.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/krebs/3modules/exim-retiolum.nix b/krebs/3modules/exim-retiolum.nix index 8b6ac4a4e..d6b7ab753 100644 --- a/krebs/3modules/exim-retiolum.nix +++ b/krebs/3modules/exim-retiolum.nix @@ -57,6 +57,8 @@ let syslog_timestamp = false syslog_duplication = false + tls_advertise_hosts = + begin acl acl_check_rcpt: diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix index 70d65cfc3..19169b186 100644 --- a/krebs/5pkgs/builders.nix +++ b/krebs/5pkgs/builders.nix @@ -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 ''; |