Merge from master into 4.next

[exim.git] / test / confs / 0572

diff --git a/test/confs/0572 b/test/confs/0572
index 2cce49c3856e3295d77fad37682529429557c1c0..23da35a096f5391cf0fd6bd30005b145f7fde603 100644 (file)
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -2,14 +2,9 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-hide 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 -----
 
@@ -28,7 +23,7 @@ my_main_router:
   route_list = * 127.0.0.1
   self = send
   transport = my_smtp
-  debug_print = router_name <$router_name>
+  hide debug_print = router_name <$router_name>
   no_more
 
 
@@ -40,7 +35,6 @@ my_smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
-  hide socks_proxy = 127.0.0.1 port=PORT_D OPT
   debug_print = transport_name <$transport_name>