diff options
| author | lain <lain@soykaf.club> | 2019-05-17 11:33:04 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-17 11:33:04 +0200 |
| commit | 67af50ec713d46e6e1d72605b985858cc15aad3c (patch) | |
| tree | 044e9f4235fbcbe7985ea36a98558bac05b0ae42 /config | |
| parent | e39c190f046bb345e80a2195278bb59ac81b8002 (diff) | |
| parent | 3e5301ad5cf3d9805c0dc9ea8440992de160330b (diff) | |
| download | pleroma-67af50ec713d46e6e1d72605b985858cc15aad3c.tar.gz pleroma-67af50ec713d46e6e1d72605b985858cc15aad3c.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 92d3e0dcd..61e2648a9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -406,8 +406,7 @@ config :pleroma_job_queue, :queues, mailer: 10, transmogrifier: 20, scheduled_activities: 10, - background: 5, - user: 10 + background: 5 config :pleroma, :fetch_initial_posts, enabled: false, @@ -466,6 +465,9 @@ config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true +config :http_signatures, + adapter: Pleroma.Signature + # 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 a0c90c371..40db66170 100644 --- a/config/test.exs +++ b/config/test.exs @@ -61,6 +61,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :app_account_creation, max_requests: 5 +config :pleroma, :http_security, report_uri: "https://endpoint.com" + try do import_config "test.secret.exs" rescue |