Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 2021

diff --git a/test/confs/2021 b/test/confs/2021
index 97b98d6ada3197644541d525340b6e988ec26f31..ccd201719c64c2a4b5285606ed4e6f29e1ae874f 100644 (file)
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -3,14 +3,9 @@
 REQUIRE=#
 TRYCLEAR=#
 
-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 -----