git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMARC: expand main-config options. Bug 3102
[exim.git]
/
test
/
confs
/
0101
diff --git
a/test/confs/0101
b/test/confs/0101
index 05832fb45122cafbde2eef9c4068b54e902f63b3..8fd0841cb26151f4de96b8b54cd50b0a7eb8768e 100644
(file)
--- a/
test/confs/0101
+++ b/
test/confs/0101
@@
-1,13
+1,7
@@
# Exim test configuration 0101
# Exim test configuration 0101
-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 -----
# ----- Main settings -----
@@
-31,11
+25,13
@@
all:
mmdf_localuser:
driver = accept
local_part_prefix = mmdf-
mmdf_localuser:
driver = accept
local_part_prefix = mmdf-
+ local_parts = userx
transport = mmdf_local_delivery
filtered_localuser:
driver = accept
local_part_prefix = filter-
transport = mmdf_local_delivery
filtered_localuser:
driver = accept
local_part_prefix = filter-
+ local_parts = userx
transport = filtered_local_delivery
bsmtp_localuser:
transport = filtered_local_delivery
bsmtp_localuser:
@@
-56,11
+52,12
@@
begin transports
smtp:
driver = smtp
port = PORT_S
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
local_delivery:
driver = pipe
check_string = "From "
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 = /
escape_string = ">From "
user = CALLER
current_directory = /
@@
-68,7
+65,7
@@
local_delivery:
bsmtp_local_delivery:
driver = pipe
use_bsmtp
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
delivery_date_add
envelope_to_add
return_path_add
@@
-77,7
+74,7
@@
bsmtp_local_delivery:
filtered_local_delivery:
driver = pipe
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
delivery_date_add
envelope_to_add
return_path_add
@@
-88,7
+85,7
@@
filtered_local_delivery:
mmdf_local_delivery:
driver = pipe
check_string = "\1\1\1\1\n"
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"
escape_string = "\1\1\1\1 \n"
message_prefix = "\1\1\1\1\n"
message_suffix = "\1\1\1\1\n"