testsuite output changes resulting

[users/heiko/exim.git] / test / confs / 0603

diff --git a/test/confs/0603 b/test/confs/0603
index eaf6a6b908a4f4552253c0cb64ca673be7a36b28..7e52e00c05f13cab9606ea8f1c48aa213fe8b7fb 100644 (file)
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -1,57 +1,41 @@
 # Exim test configuration 0603
 # Exim test configuration 0603

-# Add several messages going to the same location
-# And change smtp output based on senders domain
-
-hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
-untrusted_set_sender = *
-
-SERVER =
+# log_defer_output on pipe transport

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 

-rfc1413_query_timeout = 0s
-log_selector = +sender_on_delivery
+primary_hostname = myhost.test.ex

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

-acl_smtp_rcpt = accept
+log_selector = +received_recipients

 
 

-queue_only
-queue_run_in_order
+#acl_smtp_rcpt = accept

 
 # ----- Routers -----
 
 begin routers
 
 client:
 
 # ----- Routers -----
 
 begin routers
 
 client:

-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
-  transport = send_to_server
-
-server:
-  driver = accept
-  transport = send_to_server
-
+  driver =     accept
+  transport =  pipe

 
 # ----- Transports -----
 
 begin transports
 
 
 # ----- Transports -----
 
 begin transports
 

-send_to_server:
-  driver = smtp
-  connection_max_messages = 0
-  allow_localhost
-  hosts = 127.0.0.1
-  port = PORT_D
-  hosts_try_fastopen = :
-  # assumes that HOSTIPV4 can send to 127.0.0.1
-  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+pipe:
+    driver      = pipe
+    temp_errors = *
+    command     = perl -e "print 'Hi from pipe'; exit 5;"
+    log_defer_output = true
+    path       = ${env{PATH}}

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

+

 begin retry
 
 begin retry
 

-* * F,5d,10s
+* * F,1h,10m

 
 

-# End

 
 

+# End