DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 2100

diff --git a/test/confs/2100 b/test/confs/2100
index bce339b19c458b1c733447b7e38c5f64ef3ddb0b..6425f3a0fee021dae33d49469ba09100f93c66cc 100644 (file)
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -20,13 +20,10 @@ queue_run_in_order
 
 tls_advertise_hosts = *
 
 
 tls_advertise_hosts = *
 

-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1

 
 tls_verify_hosts = *
 
 tls_verify_hosts = *

-tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+tls_verify_certificates = DIR/aux-fixed/cert2

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


@@ -49,6 +46,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2