diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
| commit | ce6dfb6f066616553d8594fd6ffadcc96ad1daff (patch) | |
| tree | b7b4022f45fd01233bf76138d5222b81f16e8ad4 /config/config.exs | |
| parent | 5cb37412a21420509f61027fe486ae66242f800a (diff) | |
| parent | d9aacbec4d8e787ff9f62427a120d28366463a7f (diff) | |
| download | pleroma-1.0.2.tar.gz | |
Merge branch 'release/1.0.2' into 'master'v1.0.2
1.0.2 release
See merge request pleroma/pleroma!1499
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 05f67abb2..872ee3b00 100644 --- a/config/config.exs +++ b/config/config.exs @@ -194,6 +194,8 @@ config :pleroma, :http, send_user_agent: true, adapter: [ ssl_options: [ + # Workaround for remote server certificate chain issues + partial_chain: &:hackney_connect.partial_chain/1, # We don't support TLS v1.3 yet versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"] ] @@ -359,7 +361,11 @@ config :pleroma, :gopher, port: 9999 config :pleroma, Pleroma.Web.Metadata, - providers: [Pleroma.Web.Metadata.Providers.RelMe], + providers: [ + Pleroma.Web.Metadata.Providers.OpenGraph, + Pleroma.Web.Metadata.Providers.TwitterCard, + Pleroma.Web.Metadata.Providers.RelMe + ], unfurl_nsfw: false config :pleroma, :suggestions, |