Merge branch '4.next'

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

diff --git a/test/confs/2007 b/test/confs/2007
index f3d150694b1c642183f5c5c9f7bd745443b2e561..a16b9a57ef5faf79b4a03e2fb9d934083809eb40 100644 (file)
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -21,6 +16,7 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
+tls_require_ciphers = NORMAL:!DHE-RSA:!DHE-DSS:!ECDHE-RSA:!ECDHE-ECDSA:!ECDHE-PSK
 
 # Set certificate only if server