Merge from master into 4.next

[exim.git] / test / confs / 0145

diff --git a/test/confs/0145 b/test/confs/0145
index ab8cc6691c5d0bcc3caa6556cc37f0fb354d3aab..16b02a8582bb6301978f92ad626fe6f804feb6da 100644 (file)
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,14 +1,9 @@
 # Exim test configuration 0145
 
 # Exim test configuration 0145
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+

 qualify_domain = test.ex
 qualify_domain = test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----