diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-10 01:23:20 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-10 01:23:20 +0300 |
| commit | d1abf7a3585e4bc1ebea4f615ae2e149d5a56918 (patch) | |
| tree | b76a8bacf53300bcd4816b3018311c23c51368c0 /config | |
| parent | 3542ca6702707ace070761c57350c10cd8c2a745 (diff) | |
| parent | ceb2e09126a48fa341d5ff84371db49ae022bc12 (diff) | |
| download | pleroma-d1abf7a3585e4bc1ebea4f615ae2e149d5a56918.tar.gz pleroma-d1abf7a3585e4bc1ebea4f615ae2e149d5a56918.zip | |
Merge branch 'develop' into feature/moderation-log-filters
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/docker.exs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index f630771a3..5206fe375 100644 --- a/config/config.exs +++ b/config/config.exs @@ -560,6 +560,10 @@ config :pleroma, :rate_limit, nil config :pleroma, Pleroma.ActivityExpiration, enabled: true +config :pleroma, :web_cache_ttl, + activity_pub: nil, + activity_pub_question: 30_000 + # 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/docker.exs b/config/docker.exs index 63ab4cdee..f9f27d141 100644 --- a/config/docker.exs +++ b/config/docker.exs @@ -10,7 +10,7 @@ config :pleroma, :instance, notify_email: System.get_env("NOTIFY_EMAIL"), limit: 5000, registrations_open: false, - dynamic_configuration: true + healthcheck: true config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, |