Merge from master into 4.next

[exim.git] / test / confs / 2121

diff --git a/test/confs/2121 b/test/confs/2121
index a80e8efbb48f2393a17e760773f9d8e0f14e179e..573ea379a5d27b2abe283f79cd41a311ead78e66 100644 (file)
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -3,13 +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
 
 # ----- Main settings -----