DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 2149

diff --git a/test/confs/2149 b/test/confs/2149
index 810ab712a3e802a0f5eea1e41d8eb638cbe2d7ca..1782391decc4c77be63e9fbae64c00e46cee7b90 100644 (file)
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -2,26 +2,20 @@
 
 SERVER =
 
 
 SERVER =
 

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

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

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

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 

-queue_only
-queue_run_in_order
+tls_advertise_hosts =  *
+tls_certificate =      DIR/aux-fixed/cert1

 
 

-tls_advertise_hosts = *
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
+.ifdef DATA
+tls_eccurve =          DATA
+.endif

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -29,32 +23,28 @@ tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
 begin routers
 
 client:
 begin routers
 
 client:

-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
+  driver =     accept
+  condition =  ${if eq {SERVER}{server}{no}{yes}}

   retry_use_local_part
   retry_use_local_part

-  transport = send_to_server
+  transport =  send_to_server
+  errors_to =  ""

 
 server:
 
 server:

-  driver = accept
-  retry_use_local_part
-  transport = local_delivery
-
+  driver =     redirect
+  data =       :blackhole:

 
 # ----- Transports -----
 
 begin transports
 
 
 # ----- Transports -----
 
 begin transports
 

-local_delivery:
-  driver = appendfile
-  file = DIR/test-mail/$local_part
-  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
-  user = CALLER
-

 send_to_server:
 send_to_server:

-  driver = smtp
+  driver =     smtp

   allow_localhost
   allow_localhost

-  hosts = 127.0.0.1
-  port = PORT_D
-  tls_try_verify_hosts = :
+  hosts =      127.0.0.1
+  port =       PORT_D
+  hosts_try_fastopen =         :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :
+  hosts_require_tls =          *

 
 # End
 
 # End