Merge from master into 4.next

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

diff --git a/test/confs/0215 b/test/confs/0215
index 30277dac8ef85da99b68e7bf724231afdc7d7eaa..ad40d6338f62898633e3ca652ed5854bfe7986cc 100644 (file)
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -4,14 +4,9 @@ IGNORE_QUOTA=false
 AUTHS=
 AUTHF=
 
 AUTHS=
 AUTHF=
 

-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 -----