diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-01 12:48:49 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-01 12:48:49 +0300 |
| commit | d9e4b77f8be8249b428a7ef1448c9a2161dee88a (patch) | |
| tree | 927869f5bdadc70c579b2fcbe09223a9dd593ab1 /config | |
| parent | 814b275af7748df6bd11dfc6be1b4efce8d5ae70 (diff) | |
| parent | 438394d40447bdfb590ff206ad80907294da0e65 (diff) | |
| download | pleroma-d9e4b77f8be8249b428a7ef1448c9a2161dee88a.tar.gz pleroma-d9e4b77f8be8249b428a7ef1448c9a2161dee88a.zip | |
Merge branch 'develop' into gun
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 38 | ||||
| -rw-r--r-- | config/test.exs | 6 |
3 files changed, 40 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index ed074a99c..159aa6398 100644 --- a/config/config.exs +++ b/config/config.exs @@ -578,6 +578,7 @@ config :http_signatures, config :pleroma, :rate_limit, authentication: {60_000, 15}, + timeline: {500, 3}, search: [{1000, 10}, {1000, 30}], app_account_creation: {1_800_000, 25}, relations_actions: {10_000, 10}, diff --git a/config/description.exs b/config/description.exs index 53edaa6a8..307f8b5bc 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1903,6 +1903,18 @@ config :pleroma, :config_description, [ suggestions: [50] } ] + }, + %{ + key: :crontab, + type: {:list, :tuple}, + description: "Settings for cron background jobs", + suggestions: [ + {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, + {"0 * * * *", Pleroma.Workers.Cron.StatsWorker}, + {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, + {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, + {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} + ] } ] }, @@ -2454,6 +2466,12 @@ config :pleroma, :config_description, [ suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] }, %{ + key: :timeline, + type: [:tuple, {:list, :tuple}], + description: "For requests to timelines (each timeline has it's own limiter)", + suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] + }, + %{ key: :app_account_creation, type: [:tuple, {:list, :tuple}], description: "For registering user accounts from the same IP address", @@ -2928,5 +2946,25 @@ config :pleroma, :config_description, [ description: "A path to custom Elixir modules (such as MRF policies)." } ] + }, + %{ + group: :pleroma, + key: :streamer, + type: :group, + description: "Settings for notifications streamer", + children: [ + %{ + key: :workers, + type: :integer, + description: "Number of workers to send notifications.", + suggestions: [3] + }, + %{ + key: :overflow_workers, + type: :integer, + description: "Maximum number of workers created if pool is empty.", + suggestions: [2] + } + ] } ] diff --git a/config/test.exs b/config/test.exs index d4c641eef..7cc669c19 100644 --- a/config/test.exs +++ b/config/test.exs @@ -74,11 +74,7 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false -config :pleroma, :rate_limit, - search: [{1000, 30}, {1000, 30}], - app_account_creation: {10_000, 5}, - password_reset: {1000, 30}, - ap_routes: nil +config :pleroma, :rate_limit, %{} config :pleroma, :http_security, report_uri: "https://endpoint.com" |