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/5650 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/5650')
| -rw-r--r-- | test/confs/5650 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/confs/5650 b/test/confs/5650 index bf4462be3..ef73220fd 100644 --- a/test/confs/5650 +++ b/test/confs/5650 @@ -3,13 +3,9 @@ CRL= -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = server1.example.com -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -27,7 +23,7 @@ tls_advertise_hosts = * tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key tls_crl = CRL -tls_ocsp_file = OCSP +tls_ocsp_file = OPT #tls_verify_hosts = HOSTIPV4 #tls_try_verify_hosts = * |