diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 01:03:25 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 01:03:25 +0300 |
| commit | 36049f08efadb5f6f727753ecc1f7be6a5b4e3d8 (patch) | |
| tree | 2f1e1b5a20ad654cda4021115e621887d2735959 /config/config.exs | |
| parent | e7c175c943e9e3f53df76d812c09cfeffdb1c56b (diff) | |
| parent | 33729bbb2834bfa1f223b11d47dc8e3230d47657 (diff) | |
| download | pleroma-36049f08efadb5f6f727753ecc1f7be6a5b4e3d8.tar.gz pleroma-36049f08efadb5f6f727753ecc1f7be6a5b4e3d8.zip | |
Merge develop
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index f7b862ad7..fe56bb6f7 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 @@ -344,7 +345,8 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.TwitterCard, Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.OEmbed - ] + ], + ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] config :pleroma, :media_proxy, enabled: false, @@ -536,8 +538,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. |