Merge from master into 4.next

[exim.git] / test / confs / 0300

diff --git a/test/confs/0300 b/test/confs/0300
index cf47c2b7921b8daa83c3bfbe1fc67a1658cc6517..814f8ee0fd4f717bd8cd65be344491c81152a585 100644 (file)
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -3,14 +3,9 @@
 DELAY=0s
 PAH=127.0.0.1
 
-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 -----