Merge from master into 4.next

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

diff --git a/test/confs/1007 b/test/confs/1007
index 2bcd150a9e0f793dd79bc021c1bd0c0c79f2cb6e..3f354f9c9b9f2f3a00fff2b5b831501117749fc3 100644 (file)
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -4,14 +4,9 @@ PORT=
 IFACE=
 
 
 IFACE=
 
 

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