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

[exim.git] / test / confs / 0345

diff --git a/test/confs/0345 b/test/confs/0345
index d6456345ee1e23ad68e86aceea422e698d49a505..939bbeaec53db9bdb26b741f136259d29efc0747 100644 (file)
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -1,13 +1,7 @@
 # Exim test configuration 0345
 
 # Exim test configuration 0345
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -15,7 +9,7 @@ domainlist local_domains = test.ex
 
 qualify_domain = test.ex
 ignore_bounce_errors_after = 0s
 
 qualify_domain = test.ex
 ignore_bounce_errors_after = 0s

-admin_groups = CALLER
+admin_groups = CALLERGROUP

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


@@ -34,7 +28,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   quota = 20
   user = CALLER
 
   quota = 20
   user = CALLER