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
Fix the PIPE_CONNECT feature control in the template Makefile, the
[users/heiko/exim.git]
/
test
/
confs
/
0284
diff --git
a/test/confs/0284
b/test/confs/0284
index 0ec0b0f931f44d5601274c65a0e04dfc63e8bcd1..98f5660b7c05e14c77d92607323523b0a4749b12 100644
(file)
--- a/
test/confs/0284
+++ b/
test/confs/0284
@@
-1,13
+1,8
@@
# Exim test configuration 0284
# Exim test configuration 0284
-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
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-21,7
+16,9
@@
begin routers
all:
driver = accept
address_data = ${if match{$local_part}{^(.)}{$1}}
all:
driver = accept
address_data = ${if match{$local_part}{^(.)}{$1}}
- transport = ${if match{$local_part}{^.*-(.*)\$}{$1}fail}
+ transport = ${if eq {${substr_-1_1:$local_part}}{1} {t1} \
+ {${if eq {${substr_-1_1:$local_part}}{2} {t2} \
+ {${if eq {${substr_-1_1:$local_part}}{3} {t3} {t4}}}}}}
# ----- Transports -----
# ----- Transports -----
@@
-38,14
+35,14
@@
t1:
t2:
driver = appendfile
batch_max = 100
t2:
driver = appendfile
batch_max = 100
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
envelope_to_add
user = CALLER
t3:
driver = appendfile
batch_max = 100
envelope_to_add
user = CALLER
t3:
driver = appendfile
batch_max = 100
- file = DIR/test-mail/$
domain
+ file = DIR/test-mail/$
{bless:$domain}
envelope_to_add
user = CALLER
envelope_to_add
user = CALLER