DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0264

diff --git a/test/confs/0264 b/test/confs/0264
index be718bcc9905fdad2ab0063ce921d453bedbd5a8..cc1ad5d0f6298900ff47ecf3d4d4c22ff97136fb 100644 (file)
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,13 +1,8 @@
 # Exim test configuration 0264
 
 # Exim test configuration 0264
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -21,6 +16,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
   quota = ${if eq{$local_part}{userx}{3}{10000}}
   user = CALLER
 
   quota = ${if eq{$local_part}{userx}{3}{10000}}


@@ -30,6 +26,7 @@ local_delivery2:
   driver = appendfile
   retry_use_local_part = false
   file = DIR/test-mail/$local_part
   driver = appendfile
   retry_use_local_part = false
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
   quota = 3
   current_directory = /
   user = CALLER
   quota = 3
   current_directory = /


@@ -68,6 +65,12 @@ r5:
   allow_defer
   data = :defer: not just now
 
   allow_defer
   data = :defer: not just now
 

+r_remain:
+  driver = redirect
+  allow_defer
+  data = :defer: not just now
+
+

 # ----- Retry -----
 
 begin retry
 # ----- Retry -----
 
 begin retry