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
Lookups: sub-path for dsearch
[exim.git]
/
test
/
confs
/
0015
diff --git
a/test/confs/0015
b/test/confs/0015
index 04dc46cf2fcc0b0b2e1c78635478734930ec6207..afd8144c59ae1bf14ac2ba2bee9d873c8638b386 100644
(file)
--- a/
test/confs/0015
+++ b/
test/confs/0015
@@
-1,12
+1,7
@@
# Exim test configuration 0015
# Exim test configuration 0015
-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 -----
@@
-38,7
+33,7
@@
userforward:
allow_filter
local_parts = userx
user = CALLER
allow_filter
local_parts = userx
user = CALLER
- file = DIR/aux-fixed/0015.filter.
$local_part
+ file = DIR/aux-fixed/0015.filter.
userx
local_part_prefix = *+
local_part_prefix_optional
pipe_transport = address_pipe
local_part_prefix = *+
local_part_prefix_optional
pipe_transport = address_pipe
@@
-86,9
+81,11
@@
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
return_path_add
headers_add = X-local_part: $local_part\n\
return_path_add
headers_add = X-local_part: $local_part\n\
- X-local_part_prefix: $local_part_prefix
+ X-local_part_prefix: $local_part_prefix\n\
+ X-local_part_prefix_v: $local_part_prefix_v
local_delivery_b:
driver = appendfile
local_delivery_b:
driver = appendfile
@@
-96,15
+93,18
@@
local_delivery_b:
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
return_path_add
use_bsmtp
headers_add = X-local_part: $local_part\n\
return_path_add
use_bsmtp
headers_add = X-local_part: $local_part\n\
- X-local_part_prefix: $local_part_prefix
+ X-local_part_prefix: $local_part_prefix\n\
+ X-local_part_prefix_v: $local_part_prefix_v
delivery_s:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
delivery_s:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
address_reply:
allow_localhost
address_reply: