Pipeline QUIT after data

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

diff --git a/test/confs/0900 b/test/confs/0900
index cdc6d84ebdba987fb2a3b02e279a2de581f8e698..2409f395ec4b19b2e6708c0e99065fe8edfb45f0 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,27 +1,53 @@
 # Exim test configuration 0900
 SERVER=
+SRV=
+LIST=
+ALLOW=
 
 exim_path = EXIM_PATH
 keep_environment =
+add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
-tls_advertise_hosts =
+tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 
 # ----- Main settings -----
 
-domainlist local_domains = @
+primary_hostname = testhost.test.ex
+domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient
+acl_smtp_data_prdr = check_prdr
 acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
 
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +millisec +dkim_verbose
+.else
+log_selector = +received_recipients +millisec
+.endif
+
+.ifdef _OPT_MAIN_TLS_CERTIFICATE
+tls_certificate = DIR/aux-fixed/cert1
+.endif
+
+ALLOW
 
 # ----- ACL -----
 
@@ -32,11 +58,14 @@ check_recipient:
   accept domains = +local_domains
   deny   message = relay not permitted
 
+check_prdr:
+  accept local_parts = good
+  deny
+
 check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
-
 # ----- Routers -----
 
 begin routers
@@ -44,7 +73,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
-  transport =  remote_smtp
+  transport =  remote_smtp${if eq {SRV}{dkim} {_dkim}}
   errors_to =  ""
 
 fail_remote_domains:
@@ -67,7 +96,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
@@ -77,10 +106,35 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =
+  allow_localhost
+  command_timeout = 2s
+  final_timeout = 2s
+
+remote_smtp_dkim:
+  driver = smtp
+  hosts =      127.0.0.1
+  port =       PORT_S
+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 
+.ifdef _HAVE_DKIM
+.ifdef SRV
+  dkim_domain =                test.ex
+  dkim_selector =      sel
+  dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
+.ifndef HEADERS_MAXSIZE
+  dkim_sign_headers =  LIST
+.endif
+.endif
+.endif
+
 # ----- Retry -----
 
 begin retry