Merge from master into 4.next

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

diff --git a/test/confs/3600 b/test/confs/3600
index 3e491386bd3b6293478cf9844fb177598a4bd918..f6d4f8605807d547693e8b27673cd89f27a5bc4e 100644 (file)
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----