X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..a1ebfb2e46e13ee87afc91856a4af38175735d74:/test/confs/0101 diff --git a/test/confs/0101 b/test/confs/0101 index 3b421a755..8fd0841cb 100644 --- a/test/confs/0101 +++ b/test/confs/0101 @@ -1,12 +1,7 @@ # Exim test configuration 0101 -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 ----- @@ -30,11 +25,13 @@ all: mmdf_localuser: driver = accept local_part_prefix = mmdf- + local_parts = userx transport = mmdf_local_delivery filtered_localuser: driver = accept local_part_prefix = filter- + local_parts = userx transport = filtered_local_delivery bsmtp_localuser: @@ -55,11 +52,12 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : local_delivery: driver = pipe check_string = "From " - command = /bin/sh -c 'cat >>DIR/test-mail/$local_part' + command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data' escape_string = ">From " user = CALLER current_directory = / @@ -67,7 +65,7 @@ local_delivery: bsmtp_local_delivery: driver = pipe use_bsmtp - command = /bin/sh -c 'cat >>DIR/test-mail/$local_part' + command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data' delivery_date_add envelope_to_add return_path_add @@ -76,7 +74,7 @@ bsmtp_local_delivery: filtered_local_delivery: driver = pipe - command = /bin/sh -c 'cat >>DIR/test-mail/$local_part' + command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data' delivery_date_add envelope_to_add return_path_add @@ -87,7 +85,7 @@ filtered_local_delivery: mmdf_local_delivery: driver = pipe check_string = "\1\1\1\1\n" - command = /bin/sh -c 'cat >>DIR/test-mail/$local_part' + command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data' escape_string = "\1\1\1\1 \n" message_prefix = "\1\1\1\1\n" message_suffix = "\1\1\1\1\n"