diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-08 22:53:12 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-08 22:53:12 +0000 |
| commit | 46200d8facfa63343360c9e14cf94f34c55c7d53 (patch) | |
| tree | 0edf0ffc6b62a49088ff0f138ec4818bb22b16ca /config | |
| parent | 735f40047aad36dbe2b6ff09d073b7362f82f92a (diff) | |
| parent | b57913b13ad07cfaa345f7d1e964cd37e5545aa5 (diff) | |
| download | pleroma-46200d8facfa63343360c9e14cf94f34c55c7d53.tar.gz pleroma-46200d8facfa63343360c9e14cf94f34c55c7d53.zip | |
Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 2b9aabf80..cd4c8e562 100644 --- a/config/config.exs +++ b/config/config.exs @@ -133,7 +133,14 @@ config :pleroma, :httpoison, Pleroma.HTTP config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. -config :pleroma, :http, proxy_url: nil +config :pleroma, :http, + proxy_url: nil, + adapter: [ + ssl_options: [ + # We don't support TLS v1.3 yet + versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"] + ] + ] config :pleroma, :instance, name: "Pleroma", |