MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

[users/jgh/exim.git] / test / confs / 2104

diff --git a/test/confs/2104 b/test/confs/2104
index 8118ef889a0835dce1a81ed942c2858f2f26df54..d37523c8bb8fc6d098e5afc9338c0e6317ad34db 100644 (file)
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,13 +1,8 @@
 # Exim test configuration 2104
 
 # Exim test configuration 2104
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -49,7 +44,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER