Merge from master into 4.next

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

diff --git a/test/confs/2016 b/test/confs/2016
index ef6e14463ff3e828762812b9c2837302b7360f26..b14e1f30087da8d532d02fc5536bb933adbcfa11 100644 (file)
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,12 +1,7 @@
 # Exim test configuration 2016
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----