Merge branch 'master' into 4.next

[exim.git] / test / confs / 0147

diff --git a/test/confs/0147 b/test/confs/0147
index bf78500f4fe874d656ba2da929af1987e54d6370..996d064be0848515b550179db5ee6a0731e06216 100644 (file)
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -6,16 +6,10 @@ x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
 ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+

 qualify_domain = test.ex
 qualify_domain = test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

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