Merge from master into 4.next

[exim.git] / test / confs / 0304

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