X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..2377e1d8c7263b4f83aa714e4c8c315babb57c6a:/test/confs/0097?ds=sidebyside diff --git a/test/confs/0097 b/test/confs/0097 index c8e773fc2..495349d3f 100644 --- a/test/confs/0097 +++ b/test/confs/0097 @@ -1,12 +1,7 @@ # Exim test configuration 0097 -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 ----- @@ -21,7 +16,8 @@ localuser: driver = accept local_parts = userx headers_add = "${if def:h_x-rbl-warning: {Added: by router}}" - headers_remove = "${if def:h_x-rbl-warning: {subject}}" + # Colon-sep list! + headers_remove = "${if def::h_x-rbl-warning:: {subject}}" transport = local_delivery @@ -33,9 +29,9 @@ 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 = "${if def:h_tadd: {Added: by transport}}" - headers_remove = "${if def:h_tadd: {tadd}}" + headers_remove = "${if def::h_tadd:: {tadd}}" return_path_add user = CALLER