X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2007;h=db46a6c6f96e50f077419753d160ceb6f612fea4;hb=7e26c2f6e641307f44c7a0c88def1d43f3e67eab;hp=934387512f612754f98005e6a7c60076e6b2bdc1;hpb=bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0;p=exim.git diff --git a/test/confs/2007 b/test/confs/2007 index 934387512..db46a6c6f 100644 --- a/test/confs/2007 +++ b/test/confs/2007 @@ -2,14 +2,9 @@ SERVER = -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -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 @@ -50,7 +46,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER @@ -59,11 +55,13 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : send_to_server2: driver = smtp allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # End