DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0015

diff --git a/test/confs/0015 b/test/confs/0015
index 593c29555462c71a51ede82a1094ba9ce84d0d6b..1381d7cd76a0ec7810a3838b3e82457e37544d90 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,13 +1,7 @@
 # Exim test configuration 0015
 
-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 -----
 
@@ -23,7 +17,7 @@ convert_to_real_name:
   allow_defer
   data = "\
     $local_part_prefix${lookup{$local_part}\
-    lsearch{DIR/aux-fixed/0015.realnames}{$value}fail}@$domain"
+    lsearch{DIR/aux-fixed/TESTNUM.realnames}{$value}fail}@$domain"
   local_part_prefix = *+
   local_part_prefix_optional
   retry_use_local_part
@@ -31,7 +25,7 @@ convert_to_real_name:
 #system_aliases:
 #  driver = redirect
 #  allow_defer
-#  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/0015.aliases}}
+#  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.aliases}}
 #  retry_use_local_part
 
 userforward:
@@ -39,7 +33,7 @@ userforward:
   allow_filter
   local_parts = userx
   user = CALLER
-  file = DIR/aux-fixed/0015.filter.$local_part
+  file = DIR/aux-fixed/TESTNUM.filter.userx
   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe
@@ -87,9 +81,11 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   headers_add = X-local_part: $local_part\n\
-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v
 
 local_delivery_b:
   driver = appendfile
@@ -97,15 +93,18 @@ local_delivery_b:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v
 
 delivery_s:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen = :
   allow_localhost
 
 address_reply: