DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0600

diff --git a/test/confs/0600 b/test/confs/0600
index 6719259562b448025d0a4d54807622a535233af6..c2460801a97cd1b4310366b60980dd6a4849b7c1 100644 (file)
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -1,13 +1,8 @@
 # Exim test configuration 0600
 # utf8clean:string
 
 # Exim test configuration 0600
 # utf8clean:string
 

-exim_path = EXIM_PATH
-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 -----
 


@@ -25,15 +20,17 @@ begin acl
 
 check_data:
   accept logwrite = \
 
 check_data:
   accept logwrite = \

-                       x-test-header-good1: ${utf8clean:$h_x-test-header-good1:}
-                logwrite = \
-                       x-test-header-good2: ${utf8clean:$h_x-test-header-good2:}
-                logwrite = \
-                       x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:}
-                logwrite = \
-                       x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:}
-                logwrite = \
-                       x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:}
+                       x-test-header-good1: ${utf8clean:$h_x-test-header-good1:}
+                logwrite = \
+                       x-test-header-good2: ${utf8clean:$h_x-test-header-good2:}
+                logwrite = \
+                       x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:}
+                logwrite = \
+                       x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:}
+                logwrite = \
+                       x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:}
+                logwrite = \
+                       x-test-header-truncated: ${utf8clean:$h_x-test-header-truncated:}

 
 
 
 
 
 


@@ -62,6 +59,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"