diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
| commit | 418ae6638d64c915ce4dae742dd493f43c8025d8 (patch) | |
| tree | 88dab25ac8f569c2a7c12300be79f6cbd8357afe /config | |
| parent | a9459ff98f0af590931ef279c2bc7efb0cceac5a (diff) | |
| parent | 592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e (diff) | |
| download | pleroma-418ae6638d64c915ce4dae742dd493f43c8025d8.tar.gz pleroma-418ae6638d64c915ce4dae742dd493f43c8025d8.zip | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 99b500993..2ffa8c621 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"] ] @@ -238,6 +240,7 @@ config :pleroma, :instance, "text/bbcode" ], mrf_transparency: true, + mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, no_attachment_links: false, @@ -519,7 +522,9 @@ config :http_signatures, config :pleroma, :rate_limit, search: [{1000, 10}, {1000, 30}], - app_account_creation: {1_800_000, 25} + app_account_creation: {1_800_000, 25}, + statuses_actions: {10_000, 15}, + status_id_action: {60_000, 3} # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |