Merge branch 'callout_smtp_tpt_merge'

[exim.git] / test / confs / 1000

diff --git a/test/confs/1000 b/test/confs/1000
index 59c113d22411b42afca6f25b70669e550fb9a0c9..f27d4ff6f14d82196adbd02c273bedf4cd348534 100644 (file)
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -2,15 +2,9 @@
 
 HL=
 
 
 HL=
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----