Merge from master into 4.next

[exim.git] / test / confs / 0020

diff --git a/test/confs/0020 b/test/confs/0020
index 1182e6a84ad949a7a1504bb6397393e1a8e8aade..ce48c884c00b9bccb5812e040d9cd5b4a750df4b 100644 (file)
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,13 +1,8 @@
 # Exim test configuration 0020
 
-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 -----