Merge branch 'master' into 4.next

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

diff --git a/test/confs/0217 b/test/confs/0217
index 44dce1345ba54b41e1aad3e8a67c925e84bd6ebf..0b3abb71d976f6cfb9fec7a7aaf1dc195edc4201 100644 (file)
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -2,15 +2,9 @@
 
 HAP=
 
 
 HAP=
 

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

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----