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

[exim.git] / test / confs / 0310

diff --git a/test/confs/0310 b/test/confs/0310
index 44953ba85da192b7e7013daf04bc7bde61bbf380..a999c26426c6c13b45e1bcd86ec247a9004fabf1 100644 (file)
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -1,14 +1,8 @@
 # Exim test configuration 0310
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -34,13 +28,13 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   quota = 5
   user = CALLER
 
 bounce:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER