diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
| commit | 9cba0ffefa95079168f3419cf11eb98400a468db (patch) | |
| tree | f483f11d62ced67b06e017a65417135b9ba8a2ce /krebs/3modules/exim-smarthost.nix | |
| parent | 4de1c87ff62dadc4cbe812a48d10241d79aca183 (diff) | |
| parent | c44e649455f3c162b66fb9d2d678a7a0eeff598b (diff) | |
merge cd/master
Diffstat (limited to 'krebs/3modules/exim-smarthost.nix')
| -rw-r--r-- | krebs/3modules/exim-smarthost.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index cee10ce7d..aba6ee0b5 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -105,7 +105,7 @@ let requires = [ "secret.service" ]; }; }; - services.exim = { + krebs.exim = { enable = true; config = '' keep_environment = @@ -136,6 +136,8 @@ let syslog_timestamp = false syslog_duplication = false + tls_advertise_hosts = + begin acl acl_check_rcpt: @@ -162,7 +164,7 @@ let control = dkim_disable_verify accept message = relay not permitted 2 - recipients = lsearch;${lsearch.internet-aliases} + recipients = lsearch*@;${lsearch.internet-aliases} require message = relay not permitted domains = +local_domains : +relay_to_domains @@ -196,7 +198,7 @@ let internet_aliases: debug_print = "R: internet_aliases for $local_part@$domain" driver = redirect - data = ''${lookup{$local_part@$domain}lsearch{${lsearch.internet-aliases}}} + data = ''${lookup{$local_part@$domain}lsearch*@{${lsearch.internet-aliases}}} dnslookup: debug_print = "R: dnslookup for $local_part@$domain" |