Add variables for wildcard portion of local-part affix. Bug 281

[exim.git] / test / confs / 0098

diff --git a/test/confs/0098 b/test/confs/0098
index deec607e914b406feefa6819815be0b0504bb05a..e16b25eaaca3f105723c2c952fa1956fee79bc01 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,22 +2,21 @@
 
 WMF=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
 qualify_domain = test.ex
 
 domainlist local_domains = test.ex : another.test.ex
+acl_smtp_rcpt = server_acl
 
 delay_warning = 10s:40s:10m
+
+.ifndef DEFAULTDWC
 delay_warning_condition = ${if !eq{$domain}{another.test.ex}{yes}{no}}
+.endif
 
 log_selector = +subject
 
@@ -26,6 +25,14 @@ queue_run_in_order
 WMF
 
 
+# ----- ACL -----
+
+# Only used in server mode
+begin acl
+server_acl:
+  defer        message = Over-quota
+
+
 # ----- Routers -----
 
 begin routers
@@ -37,6 +44,12 @@ refused:
   self = send
   transport = smtp_connect_refused
 
+remote_quota:
+  driver =     manualroute
+  route_list = remote.defer 127.0.0.1
+  self =       send
+  transport =  smtp
+
 # The IP address is deliberately V4NET.0.0.1 so as to be unreachable
 all:
   driver = manualroute
@@ -71,17 +84,20 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   return_path_add
   user = CALLER
 
 smtp:
   driver = smtp
   connect_timeout = 1s
+  port = PORT_D
+  hosts_try_fastopen = :
 
 smtp_connect_refused:
   driver = smtp
   port = PORT_N
+  hosts_try_fastopen = :
 
 
 # ----- Retry -----