Merge from master into 4.next

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

diff --git a/test/confs/2200 b/test/confs/2200
index c57c8c7966409c8f10f0f78931373703a13ffd46..904ccfb18e5db2884212fff80c5c3f5f9d74a3fd 100644 (file)
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -1,14 +1,9 @@
 # Exim test configuration 2200
 # Check for dnsdb cache TTL handling
 
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----