X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ffiles%2Fcommon%2Fexim4.conf;h=cecdcf50afa86052901bf2feb4f8bbe5802ba871;hb=229e41e0af185b68fd48a3fef863e9c370a30a04;hp=979cefac47194496ba28eba757fd6b638da0eb64;hpb=c3b45e9d62f33d4825f42829e150be6a6ab1a85f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 979cefac4..cecdcf50a 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -121,7 +121,7 @@ localpartlist local_only_users = lsearch;/etc/exim4/localusers
 # accept mail for them.
 domainlist rcpthosts = partial-lsearch;/etc/exim4/rcpthosts
 hostlist debianhosts = 127.0.0.1 : net-lsearch;/var/lib/misc/thishost/debianhosts
-domainlist mailhubdomains = lsearch;/etc/exim4/mailertable
+domainlist mailhubdomains = lsearch;/etc/exim4/manualroute
 
 .ifndef RESERVEDADDRS
 RESERVEDADDRS = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : \
@@ -747,8 +747,8 @@ relay_manualroute:
   driver = manualroute
   domains = +mailhubdomains
   transport = remote_smtp
-  route_data = ${lookup{$domain}lsearch{/etc/exim4/mailertable}}
-  require_files = /etc/exim4/mailertable
+  route_data = ${lookup{$domain}lsearch{/etc/exim4/manualroute}}
+  require_files = /etc/exim4/manualroute
 
 bsmtp:
   debug_print = "R: bsmtp for $local_part@$domain"
@@ -1156,11 +1156,11 @@ remote_smtp:
   driver = smtp
   connect_timeout = 1m
 .ifdef USE_TLS
-  tls_tempfail_tryclear = true
+#  tls_tempfail_tryclear = true
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key
-  tls_verify_certificates = /etc/exim4/ssl/ca.crt
-  tls_crl = /etc/exim4/ssl/ca.crl
+#  tls_verify_certificates = /etc/exim4/ssl/ca.crt
+#  tls_crl = /etc/exim4/ssl/ca.crl
 .endif
 
 # Send the message to procmail