DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0346

diff --git a/test/confs/0346 b/test/confs/0346
index de9e4d076f77b3e4823df4392721abd526236755..0d31b37ed310e2c988dcdcba6ae049b07efaa08d 100644 (file)
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -1,13 +1,7 @@
 # Exim test configuration 0346
 
 # Exim test configuration 0346
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -28,9 +22,9 @@ r1:
 r2:
   driver = redirect
   domains = dom1
 r2:
   driver = redirect
   domains = dom1

-  allow_filter

   user = CALLER
   user = CALLER

-  data = "#Exim filter\n unseen deliver x@dom2"
+  data = x@dom2
+  unseen = true

 
 r3:
   driver = accept
 
 r3:
   driver = accept


@@ -45,6 +39,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
   envelope_to_add
 
   user = CALLER
   envelope_to_add