From 82525c6fc2b2c12202b93250c2774bf50baae300 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 10 Aug 2014 19:06:47 +0100
Subject: Add (2 0 1) test

---
 test/confs/5850 | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'test/confs/5850')

diff --git a/test/confs/5850 b/test/confs/5850
index b2c7cb7eb..c381ef616 100644
--- a/test/confs/5850
+++ b/test/confs/5850
@@ -24,9 +24,20 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
+CDIR1 = DIR/aux-fixed
+CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-#tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = ${if eq {SERVER}{server} \
+	{${if eq {DETAILS}{ta} \
+		{CDIR2/fullchain.pem}\
+		{CDIR1/cert1}}}\
+	fail}
+
+tls_privatekey = ${if eq {SERVER}{server} \
+	{${if eq {DETAILS}{ta} \
+		{CDIR2/server1.example.com.unlocked.key}\
+		{CDIR1/cert1}}}\
+	fail}
 
 
 # ----- Routers -----
@@ -35,7 +46,7 @@ begin routers
 
 client:
   driver = dnslookup
-  condition = ${if eq {SERVER}{server}{no}{yes}}
+  condition = ${if eq {SERVER}{}}
   dnssec_request_domains = *
   self = send
   transport = send_to_server
-- 
cgit v1.2.3