Filters: fix "vacation" in Exim filter. Bug 2593

[users/heiko/exim.git] / test / confs / 2010

diff --git a/test/confs/2010 b/test/confs/2010
index c08d4ce4997fe9ca3b107b0b8a9c0a953693218d..dae45a08c88f21ca33042ac4a75cf113ed40c764 100644 (file)
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -1,19 +1,17 @@
 # Exim test configuration 2010
 
 SERVER =
 # Exim test configuration 2010
 
 SERVER =

+TIMES =

 HOSTS = 127.0.0.1 : HOSTIPV4
 
 HOSTS = 127.0.0.1 : HOSTIPV4
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_selector = +outgoing_port
+

 acl_smtp_rcpt = accept
 
 queue_only
 acl_smtp_rcpt = accept
 
 queue_only


@@ -46,15 +44,16 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTS
   driver = smtp
   allow_localhost
   hosts = HOSTS

-  hosts_require_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = *

 
 
 # ----- Retry -----
 
 begin retry
 
 
 
 # ----- Retry -----
 
 begin retry
 

-* tls_required
+* tls_required  TIMES

 * *  F,1d,5m
 
 # End
 * *  F,1d,5m
 
 # End