X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e8e86723959ffd4ab6d6b320538ec0e86f828798..71c8c2ef07fabc64c4b56b6eee1eeffb88a8f5e0:/test/confs/0600?ds=inline diff --git a/test/confs/0600 b/test/confs/0600 index 61a9c0801..58257e55e 100644 --- a/test/confs/0600 +++ b/test/confs/0600 @@ -1,13 +1,8 @@ # Exim test configuration 0600 # utf8clean:string -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 ----- @@ -25,15 +20,17 @@ begin acl 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:} @@ -61,7 +58,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "X-body-linecount: $body_linecount\n\ X-message-linecount: $message_linecount\n\ X-received-count: $received_count"