summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2014-10-24 11:07:44 +0200
committerLinus Nordberg <linus@nordberg.se>2014-10-24 11:07:44 +0200
commit5e0ad5a06c608250ca1130e378932c0275c99e63 (patch)
tree5c2789e8116820d551b66848507f5ed54090b316
parent53d252b808a62b2470a28c24a94266c67cae1ecc (diff)
parent2b2ea0445cc80d8a6852f018638d939f7a393601 (diff)
Merge branch 'disable-sslv3' into staging1
-rw-r--r--httpd_props.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/httpd_props.conf b/httpd_props.conf
index cb8a30c..ae4c7be 100644
--- a/httpd_props.conf
+++ b/httpd_props.conf
@@ -15,7 +15,8 @@
{transfer_log, "log/transfer"},
{socket_type,
{essl, % See ssl(3erl) for SSL options.
- [{certfile, "catlfish/webroot/certs/webcert.pem"},
+ [{versions, ['tlsv1.2', 'tlsv1.1', 'tlsv1']},
+ {certfile, "catlfish/webroot/certs/webcert.pem"},
{keyfile, "catlfish/webroot/keys/webkey.pem"},
{cacertfile, "catlfish/webroot/certs/webcert.pem"}]}}
].