diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-12 18:08:27 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-12 18:08:27 +0300 |
| commit | eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb (patch) | |
| tree | 77cd19ea54b8efa69e45b2d37876e7d5084cf38e /config | |
| parent | 371d39e160efa51f2fe608e1788f6b11b89d9839 (diff) | |
| parent | db75288b71e7531f8e5033f56fc0b9a7d1d8efb3 (diff) | |
| download | pleroma-eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb.tar.gz pleroma-eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb.zip | |
merge develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/test.exs | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index d8c8b1a6d..a1a510a65 100644 --- a/config/config.exs +++ b/config/config.exs @@ -250,13 +250,7 @@ config :pleroma, :instance, skip_thread_containment: true, limit_to_local_content: :unauthenticated, dynamic_configuration: false, - external_user_synchronization: [ - enabled: false, - # every 2 hours - interval: 60 * 60 * 2, - max_retries: 3, - limit: 500 - ] + external_user_synchronization: true config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -501,7 +495,7 @@ config :ueberauth, config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies -config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" diff --git a/config/test.exs b/config/test.exs index 1635a5d92..e729d9630 100644 --- a/config/test.exs +++ b/config/test.exs @@ -23,7 +23,7 @@ config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" -config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test, enabled: true config :pleroma, :instance, email: "admin@example.com", @@ -65,7 +65,9 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false -config :pleroma, :rate_limit, app_account_creation: {10_000, 5} +config :pleroma, :rate_limit, + search: [{1000, 30}, {1000, 30}], + app_account_creation: {10_000, 5} config :pleroma, :http_security, report_uri: "https://endpoint.com" |