Use common routine for building tagstring for dns-fail cache

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

diff --git a/test/confs/0574 b/test/confs/0574
index aa3e93a9e3f7a7837a6c6945b47416a4c60468be..9afc55247a072e7171bd994da5be874cc710ee12 100644 (file)
--- a/test/confs/0574
+++ b/test/confs/0574
@@ -1,45 +1,28 @@
 # Exim test configuration 0574
 
 # Exim test configuration 0574
 

-SERVER =
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 

-log_selector = +received_recipients +sender_on_delivery
+# ----- Main settings -----

 
 

-acl_smtp_rcpt = accept queue = \
-       ${if or {{eq {SERVER}{server}}{eq {normal}{$local_part}}} {} {$local_part}}
-queue_only
-queue_run_in_order
-
-#---------------
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+acl_smtp_data = chk_data

 
 

-begin routers
+queue_only

 
 

-dump:
-  driver = redirect
-  condition = ${if eq {SERVER}{server}{yes}{no}}
-  data = :blackhole:
+# ----- ACL -----

 
 

-all:
-  driver = manualroute
-  route_list = * 127.0.0.1
-  self = send
-  transport = out
+begin acl

 
 

-#---------------
+chk_mail:
+  accept control = debug/tag=_1

 
 

-begin transports
+chk_rcpt:
+  accept control = debug/kill

 
 

-out:
-  driver = smtp
-  port = PORT_D
+chk_data:
+  accept control = debug/tag=_2/opts=+all

 
 # End
 
 # End

-