Merge from master into 4.next

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

diff --git a/test/confs/0031 b/test/confs/0031
index 0328320ca4b2016b0097f3043f42309959263924..e3f0360fc5cc85d8152fec3f1dd2f2746e0fd4ae 100644 (file)
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,13 +1,8 @@
 # Exim test configuration 0031
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----