Testsuite: better portability of postgresq test vs. postgresql versions

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 7a1296c7ed4b57c9ddf0c004b4ae1929a99541f3..e02380f73694e637ca9116012bc5589742c3a6f5 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -28,8 +28,10 @@ queue_only
 smtp_receive_timeout = 2s
 log_selector = +received_recipients
 
 smtp_receive_timeout = 2s
 log_selector = +received_recipients
 

+.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}
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}

+.endif

 
 ALLOW
 
 
 ALLOW
 


@@ -50,7 +52,6 @@ check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 

-

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -94,7 +95,6 @@ remote_smtp:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

-  headers_rewrite = *@* CALLER_NAME@$domain fs

 
 remote_smtp_dkim:
   driver = smtp
 
 remote_smtp_dkim:
   driver = smtp


@@ -103,7 +103,6 @@ remote_smtp_dkim:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

-  headers_rewrite = *@* CALLER_NAME@$domain fs

 
 .ifdef OPT
   dkim_domain =                test.ex
 
 .ifdef OPT
   dkim_domain =                test.ex