diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-02-19 16:58:28 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-02-19 16:58:28 +0000 |
| commit | 2d21ea1a0e1be2e737dc4d283e72207580856214 (patch) | |
| tree | f377cf25c36de97d664f13cebacb6ff2e0d43b91 /config | |
| parent | 10a11f083ca543022c61e24b1ec0cc83811d6d06 (diff) | |
| parent | 1dd718e83c76db218f12a98344b568fe10ecbefe (diff) | |
| download | pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.tar.gz pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.zip | |
Merge branch 'develop' into fix/twittercards
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 14 | ||||
| -rw-r--r-- | config/dev.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 5db0ea9aa..317299bf1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -162,7 +162,9 @@ config :pleroma, :instance, mrf_transparency: true, autofollowed_nicknames: [], max_pinned_statuses: 1, - no_attachment_links: false + no_attachment_links: false, + welcome_user_nickname: nil, + welcome_message: nil config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -228,8 +230,8 @@ config :pleroma, :mrf_rejectnonpublic, allow_direct: false config :pleroma, :mrf_hellthread, - delist_threshold: 5, - reject_threshold: 10 + delist_threshold: 10, + reject_threshold: 20 config :pleroma, :mrf_simple, media_removal: [], @@ -330,14 +332,16 @@ config :pleroma, Pleroma.User, "web" ] -config :pleroma, Pleroma.Web.Federator, max_jobs: 50 - config :pleroma, Pleroma.Web.Federator.RetryQueue, enabled: false, max_jobs: 20, initial_timeout: 30, max_retries: 5 +config :pleroma, Pleroma.Jobs, + federator_incoming: [max_jobs: 50], + federator_outgoing: [max_jobs: 50] + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/dev.exs b/config/dev.exs index 8f89aa03c..f77bb9976 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -16,7 +16,8 @@ config :pleroma, Pleroma.Web.Endpoint, debug_errors: true, code_reloader: true, check_origin: false, - watchers: [] + watchers: [], + secure_cookie_flag: false config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local diff --git a/config/test.exs b/config/test.exs index 412970d93..fbeba0919 100644 --- a/config/test.exs +++ b/config/test.exs @@ -44,6 +44,8 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" +config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] + try do import_config "test.secret.exs" rescue |