diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs/2111 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/2111')
| -rw-r--r-- | test/confs/2111 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/confs/2111 b/test/confs/2111 index 9abfc7a1a..0d99a23bc 100644 --- a/test/confs/2111 +++ b/test/confs/2111 @@ -2,13 +2,9 @@ SERVER = -exim_path = EXIM_PATH -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 ----- @@ -52,6 +48,6 @@ send_to_server: tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 tls_require_ciphers = IDEA-CBC-MD5 \ - ${if eq{$host_address}{127.0.0.1}{:DES-CBC3-SHA:RSA_ARCFOUR_SHA}} + ${if eq{$host_address}{127.0.0.1}{:AES256-SHA:RSA_ARCFOUR_SHA}} # End |