diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
| commit | 9570a5be405c4cf4f07907eab4ced21e07fa20c9 (patch) | |
| tree | 9575741206d0604e74ab2d8f719c3da0a3002b1d /config/config.exs | |
| parent | 418ae6638d64c915ce4dae742dd493f43c8025d8 (diff) | |
| parent | 16cfee708ec8e9c6cbbeb15432127c7757c5c173 (diff) | |
| download | pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.tar.gz pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.zip | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 2ffa8c621..bda92e45d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -305,7 +305,8 @@ config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, outgoing_blocks: true, - follow_handshake_timeout: 500 + follow_handshake_timeout: 500, + sign_object_fetches: true config :pleroma, :user, deny_follow_blocked: true @@ -339,7 +340,12 @@ config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :rich_media, enabled: true, ignore_hosts: [], - ignore_tld: ["local", "localdomain", "lan"] + ignore_tld: ["local", "localdomain", "lan"], + parsers: [ + Pleroma.Web.RichMedia.Parsers.TwitterCard, + Pleroma.Web.RichMedia.Parsers.OGP, + Pleroma.Web.RichMedia.Parsers.OEmbed + ] config :pleroma, :media_proxy, enabled: false, @@ -523,8 +529,11 @@ config :http_signatures, config :pleroma, :rate_limit, search: [{1000, 10}, {1000, 30}], app_account_creation: {1_800_000, 25}, + relations_actions: {10_000, 10}, + relation_id_action: {60_000, 2}, statuses_actions: {10_000, 15}, - status_id_action: {60_000, 3} + status_id_action: {60_000, 3}, + password_reset: {1_800_000, 5} # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |