Merge branch 'master' into 4.next

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

diff --git a/test/confs/0216 b/test/confs/0216
index 777737c07ec1c87263fea2f753dd111d5b089ba7..01e1dd8019db9783f84a9a0599b6614e8ce849a5 100644 (file)
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-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/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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