Merge from master into 4.next

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

diff --git a/test/confs/0522 b/test/confs/0522
index 77f60c86af9910ad3565bf5b1a468ee8bba3c118..4909db849d90d7c69c933b6d0c1fa61304cd1b8c 100644 (file)
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -2,14 +2,9 @@
 
 TIMEOUTDEFER=
 
-exim_path = EXIM_PATH
-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 -----