diff options
| author | lain <lain@soykaf.club> | 2019-04-08 14:10:43 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-04-08 14:10:43 +0200 |
| commit | 5d871173d189a0019fda0ee76f8a324d90a163ee (patch) | |
| tree | c3e423993ff5289dd0ba73a94881bd52d9cda1c2 /config | |
| parent | 037fefe21871ee0a1926286c87c334ea1d339394 (diff) | |
| parent | aac48d0cc6893c231c88d5cd7fe0334353bbf299 (diff) | |
| download | pleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.tar.gz pleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.zip | |
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index bd8922b77..dccf7b263 100644 --- a/config/config.exs +++ b/config/config.exs @@ -348,10 +348,10 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue, initial_timeout: 30, max_retries: 5 -config :pleroma, Pleroma.Jobs, - federator_incoming: [max_jobs: 50], - federator_outgoing: [max_jobs: 50], - mailer: [max_jobs: 10] +config :pleroma_job_queue, :queues, + federator_incoming: 50, + federator_outgoing: 50, + mailer: 10 config :pleroma, :fetch_initial_posts, enabled: false, @@ -378,6 +378,8 @@ config :pleroma, :ldap, base: System.get_env("LDAP_BASE") || "dc=example,dc=com", uid: System.get_env("LDAP_UID") || "cn" +config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail + # 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/test.exs b/config/test.exs index 3691e5bd1..6a7b9067e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -48,7 +48,7 @@ config :web_push_encryption, :vapid_details, config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] +config :pleroma_job_queue, disabled: true try do import_config "test.secret.exs" |