Merge from master into 4.next

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

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