Testsuite: fix 0173 + 2100+, take 2

[users/heiko/exim.git] / test / confs / 0611

diff --git a/test/confs/0611 b/test/confs/0611
index b1bff27a17ccd17e5522b7982aee61866ca6f2d5..4f6f490d39438e876a9bd5fc8c23b78f368646d5 100644 (file)
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -4,15 +4,19 @@
 SERVER=
 
 exim_path = EXIM_PATH
 SERVER=
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

-log_file_path = DIR/spool/log/%slog

 gecos_pattern = ""
 gecos_name = CALLER_NAME
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =
+chunking_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_file_path = DIR/spool/log/${if eq {SERVER}{server} {server_}{}}%slog
+

 qualify_domain = test.ex
 queue_run_in_order
 log_selector = +received_recipients
 qualify_domain = test.ex
 queue_run_in_order
 log_selector = +received_recipients