Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-01-06 13:46:02 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-01-06 13:46:02 +0300
commitee23b688a780ae5c1de27a8e2576b6f7b9715278 (patch)
treeb9fa13420d6fefef9ddfb085f639184cf5843c8a
parentcdc7c1d1edb5f63fb277db91a3b422623de311da (diff)
Use TLS defaults from fast_tls
-rw-r--r--ejabberd.yml.example4
-rw-r--r--rebar.config2
2 files changed, 5 insertions, 1 deletions
diff --git a/ejabberd.yml.example b/ejabberd.yml.example
index 8b2eaa847..df5da35e0 100644
--- a/ejabberd.yml.example
+++ b/ejabberd.yml.example
@@ -120,6 +120,10 @@ hosts:
###. =================
###' TLS configuration
+## Note that the following configuration is the default
+## configuration of the TLS driver, so you don't need to
+## uncomment it.
+##
## define_macro:
## 'TLS_CIPHERS': "HIGH:!aNULL:!eNULL:!3DES:@STRENGTH"
## 'TLS_OPTIONS':
diff --git a/rebar.config b/rebar.config
index 352a81951..50b264f4e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -22,7 +22,7 @@
{tag, {if_version_above, "17", "3.4.2", "3.2.1"}}}},
{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}},
{cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.12"}}},
- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", "9e34c05"}},
+ {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", "71250ae"}},
{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.26"}}},
{xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.17"}}},