refactor

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 4c824c4b41ecabf68a6614a4a777fa69afe6f1e5..53d06b149231b8cdc5b9922be5c9801d587c9691 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -6,15 +6,15 @@ ALLOW=
 
 exim_path = EXIM_PATH
 keep_environment =
 
 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 = *
 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 = *

+.ifdef _HAVE_TLS

 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 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_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :


@@ -22,7 +22,9 @@ pipelining_connect_advertise_hosts = :
 .ifdef _HAVE_DMARC
 dmarc_tld_file =
 .endif
 .ifdef _HAVE_DMARC
 dmarc_tld_file =
 .endif

-
+.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS
+limits_advertise_hosts = !*
+.endif

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


@@ -37,14 +39,13 @@ queue_only
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM

-log_selector = +received_recipients +dkim_verbose
+log_selector = +received_recipients +millisec +dkim_verbose

 .else
 .else

-log_selector = +received_recipients
+log_selector = +received_recipients +millisec

 .endif
 
 .endif
 

-.ifdef _OPT_MAIN_TLS_CERTIFICATE
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.ifdef _HAVE_TLS
+tls_certificate = DIR/aux-fixed/cert1

 .endif
 
 ALLOW
 .endif
 
 ALLOW


@@ -97,6 +98,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"


@@ -107,6 +109,10 @@ remote_smtp:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+.ifdef _HAVE_TLS
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =
+.endif

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s


@@ -116,6 +122,10 @@ remote_smtp_dkim:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+.ifdef _HAVE_TLS
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =
+.endif

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s