Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 0060

diff --git a/test/confs/0060 b/test/confs/0060
index 0bf8bc4d6b58eba7d2fd15b034bc4b6ef7fbb0d9..6ff220906a5b03a1479f56bffd7d32f7e661db8e 100644 (file)
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,12 +1,8 @@
 # Exim test configuration 0060
 
 # Exim test configuration 0060
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.ex
 primary_hostname = myhost.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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