From a0d08d4793e9aa66837519d5171f4aefa7ea59fb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Apr 2016 14:26:37 +0200
Subject: exim-smarthost: don't tls_advertise_hosts

---
 krebs/3modules/exim-smarthost.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'krebs/3modules/exim-smarthost.nix')

diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index cee10ce7d..a01ab543b 100644
--- a/krebs/3modules/exim-smarthost.nix
+++ b/krebs/3modules/exim-smarthost.nix
@@ -136,6 +136,8 @@ let
         syslog_timestamp = false
         syslog_duplication = false
 
+        tls_advertise_hosts =
+
         begin acl
 
         acl_check_rcpt:
-- 
cgit v1.2.3


From 4abd59f59d8541a93ccbf1e76d1f9b95c44a9bf2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 27 Apr 2016 01:54:58 +0200
Subject: krebs.exim-{retiolum,smarthost}: use krebs.exim

---
 krebs/3modules/exim-smarthost.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/exim-smarthost.nix')

diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index a01ab543b..8d9227039 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 =
-- 
cgit v1.2.3


From ca48a77050933cab8114d9047e2e9c72a5496f0b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 21 May 2016 09:27:55 +0200
Subject: exim-smarthost: allow per-domain defaults in internet-aliases

---
 krebs/3modules/exim-smarthost.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules/exim-smarthost.nix')

diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index 8d9227039..aba6ee0b5 100644
--- a/krebs/3modules/exim-smarthost.nix
+++ b/krebs/3modules/exim-smarthost.nix
@@ -164,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
@@ -198,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"
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/48200000.lock: No such file or directory (2)