git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typoes
[users/heiko/exim.git]
/
test
/
confs
/
0095
diff --git
a/test/confs/0095
b/test/confs/0095
index ba3e7b8055615e5d94bec1499ea5d68e02f024ae..b1201f8709a7bc5871c380f3dba1646a1ad3c8f3 100644
(file)
--- a/
test/confs/0095
+++ b/
test/confs/0095
@@
-3,14
+3,9
@@
ERT=
QWM=
ERT=
QWM=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-44,7
+39,7
@@
begin transports
appendfile:
driver = appendfile
appendfile:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
quota = $h_quota
quota_warn_threshold = $h_threshold
QWM
quota = $h_quota
quota_warn_threshold = $h_threshold
QWM
@@
-52,14
+47,14
@@
appendfile:
appendfile2:
driver = appendfile
appendfile2:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
quota = $h_quota
quota_warn_threshold = $h_threshold
user = CALLER
appendfile3:
driver = appendfile
quota = $h_quota
quota_warn_threshold = $h_threshold
user = CALLER
appendfile3:
driver = appendfile
- file = DIR/test-mail/$
local_part
${if eq{$sender_address}{}{.bounce}}
+ file = DIR/test-mail/$
{bless:$local_part}
${if eq{$sender_address}{}{.bounce}}
quota_warn_threshold = $h_threshold
user = CALLER
headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
quota_warn_threshold = $h_threshold
user = CALLER
headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa