X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=7f967c4cc4b73ffac5d75467e1a49c7fee71b3b4;hb=9cb14d6c9d70dc56f6c8347f1770a7d79c809d35;hp=71cf113de11557005056169ff31c8ec3d47f6ef2;hpb=40f9f01c152a6e2de19cbf9fa564b7d481800bfb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 71cf113de..7f967c4cc 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1428,7 +1428,10 @@ virt_users:
   group = ${extract{group}{VDOMAINDATA}}
   # Manually construct the forwarding address, preserving the
   # local_part_suffix if the remote host is master.
-  data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\
+  data = ${if and {{exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}\
+                     {! eq {${lookup{$local_part}cdb\
+                            {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
+                           {}}}\
              {${local_part:${lookup{$local_part}cdb\
              {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
              ${if eq {${domain:${lookup{$local_part}cdb\
@@ -1558,7 +1561,7 @@ address_reply:
 
 remote_smtp:
   driver = smtp
-  connect_timeout = 1m
+  connect_timeout = 15s
   delay_after_cutoff = false
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key