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
std-crypto: fix missing END line of PEM
[exim.git]
/
test
/
confs
/
0015
diff --git
a/test/confs/0015
b/test/confs/0015
index 593c29555462c71a51ede82a1094ba9ce84d0d6b..b1472da06cc78136a9c9d0cad077d5390264c21c 100644
(file)
--- a/
test/confs/0015
+++ b/
test/confs/0015
@@
-1,13
+1,7
@@
# Exim test configuration 0015
# Exim test configuration 0015
-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 -----
@@
-39,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.$
{bless:$local_part}
local_part_prefix = *+
local_part_prefix_optional
pipe_transport = address_pipe
local_part_prefix = *+
local_part_prefix_optional
pipe_transport = address_pipe
@@
-86,26
+80,29
@@
local_delivery:
user = CALLER
delivery_date_add
envelope_to_add
user = CALLER
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
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
user = CALLER
delivery_date_add
envelope_to_add
local_delivery_b:
driver = appendfile
user = CALLER
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
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: