Merge from master into 4.next

[exim.git] / test / confs / 2300

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