Merge from master into 4.next

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

diff --git a/test/confs/0230 b/test/confs/0230
index df25468ed4ad4549d05f28512945df84e094087d..c26b45758a608a14b67718e5099262dcf1371de0 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,13 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

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


@@ -36,6 +32,14 @@ check_recipient:
 
 begin routers
 
 
 begin routers
 

+.ifdef OPT
+to_server:
+  driver = manualroute
+  transport = remote
+  route_list = * 127.0.0.1
+  self = send
+.endif
+

 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains
 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains


@@ -57,6 +61,9 @@ local_delivery:
   headers_add = Port: $sender_host_port
   user = CALLER
 
   headers_add = Port: $sender_host_port
   user = CALLER
 

+remote:
+  driver = smtp
+  port = PORT_D

 
 # ----- Retry -----
 
 
 # ----- Retry -----