Merge from master into 4.next

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

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