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

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

diff --git a/test/confs/0282 b/test/confs/0282
index 90875f5c0b24e165479cc2e16c64c513c9806d5c..00958b9a33c1c2f63ae63631f1060119577076d8 100644 (file)
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,17 +1,13 @@
 # Exim test configuration 0282
 
 # Exim test configuration 0282
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_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 -----
 
 acl_smtp_rcpt = accept
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept

-local_interfaces = <; 127.0.0.1.PORT_D ; [127.0.0.1]:PORT_D2 ; HOSTIPV4
+local_interfaces = <; 127.0.0.1.PORT_D ; [127.0.0.1]:PORT_D2 ; HOSTIPV4 ; 127.0.0.1.PORT_D4

 log_selector = +incoming_interface+incoming_port
 queue_only
 queue_run_in_order
 log_selector = +incoming_interface+incoming_port
 queue_only
 queue_run_in_order


@@ -30,7 +26,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
   headers_add = interface-port: $interface_port\n\
                 received-port:  $received_port
   user = CALLER
   headers_add = interface-port: $interface_port\n\
                 received-port:  $received_port