diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-19 16:55:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-19 16:55:10 -0500 |
| commit | 9169f331b6d481a0aa2b0bfe91500d695fb1b6d6 (patch) | |
| tree | 734ce297aef5a2482c88cdc7d03914943ba4cf28 /config | |
| parent | 46c7c53fbbfd9919d429ba15988af0da9e22d444 (diff) | |
| parent | c1c64d6d06fb7307245880d6605d9d9153a4784f (diff) | |
| download | pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.tar.gz pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.zip | |
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 7d539f994..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 @@ -528,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. diff --git a/config/test.exs b/config/test.exs index 96ecf3592..92dca18bc 100644 --- a/config/test.exs +++ b/config/test.exs @@ -31,6 +31,8 @@ config :pleroma, :instance, skip_thread_containment: false, federating: false +config :pleroma, :activitypub, sign_object_fetches: false + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, @@ -67,7 +69,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :rate_limit, search: [{1000, 30}, {1000, 30}], - app_account_creation: {10_000, 5} + app_account_creation: {10_000, 5}, + password_reset: {1000, 30} config :pleroma, :http_security, report_uri: "https://endpoint.com" |