Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / confs / 2011

diff --git a/test/confs/2011 b/test/confs/2011
index f5f707eb1b225ecceb4589e49cf10e522aaaef0d..eac8ccd4a5fc484e63ae4a726f54b905e8446591 100644 (file)
--- a/test/confs/2011
+++ b/test/confs/2011
@@ -1,58 +1,72 @@
 # Exim test configuration 2011
 
-SERVER =
+SERVER=
 
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys
 exim_path = EXIM_PATH
 host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
+
+.ifdef SERVER
 log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts = *
 
-# ----- Main settings -----
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+.ifdef _EXP_LIMITS
+limits_advertise_hosts = !*
+.endif
 
-acl_smtp_rcpt = accept
-log_selector = +tls_peerdn
-queue_only
-queue_run_in_order
+primary_hostname = test.ex
 
-tls_advertise_hosts = *
+# ----- Main settings -----
 
-# Set certificate only if server
+acl_smtp_rcpt = check_rcpt
 
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+log_selector = +received_recipients +dkim_verbose
+queue_only
+queue_run_in_order
 
-tls_verify_hosts = *
-tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+# ----- ACL -----
+begin acl
 
+check_rcpt:
+  defer        hosts = HOSTIPV4
+  accept
 
 # ----- Routers -----
 
 begin routers
 
-client:
-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
-  retry_use_local_part
-  transport = send_to_server
-
+d0:
+  driver =     manualroute
+  route_list = *       "HOSTIPV4::PORT_D : 127.0.0.1::PORT_D"
+  self =       send
+  transport =  gsmtp
 
 # ----- Transports -----
 
 begin transports
 
-send_to_server:
-  driver = smtp
+gsmtp:
+  driver =                     smtp
   allow_localhost
-  hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
-  port = PORT_D
-  tls_certificate = DIR/aux-fixed/cert2
-  tls_privatekey = DIR/aux-fixed/cert2
-  tls_require_ciphers = IDEA-CBC-MD5 \
-    ${if eq{$host_address}{127.0.0.1}{:DES-CBC3-SHA:RSA_ARCFOUR_SHA}}
+  tls_verify_certificates =    system
+  hosts_require_tls =          *
+
+begin retry
+* * F,5d,10s
 
 # End