Sync 4.next from master

[users/jgh/exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index 31cf2c6701c924942d936c0957a1c91670f0e0af..ae5a309b972e3ba0a57d1c184226ff1eaa8d52c6 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,15 +2,11 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -26,6 +22,7 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
 acl_smtp_rcpt = rcpt
 
 BR

+log_selector = LOG_SELECTOR

 
 qualify_domain = test.ex
 trusted_users = CALLER
 
 qualify_domain = test.ex
 trusted_users = CALLER