summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-09-09 18:53:09 +0000
committerfeld <feld@feld.me>2019-09-09 18:53:09 +0000
commitceb2e09126a48fa341d5ff84371db49ae022bc12 (patch)
treeca875c111e886b051385250811115284f88d1628 /config
parentbce16f455743c3a6603fb5d2d81c4e8200b38494 (diff)
parent11e12b5761bcd67aa609d91f6f8d1f6755b2312b (diff)
downloadpleroma-ceb2e09126a48fa341d5ff84371db49ae022bc12.tar.gz
pleroma-ceb2e09126a48fa341d5ff84371db49ae022bc12.zip
Merge branch 'cache-plug' into 'develop'
Add Pleroma.Plugs.Cache Closes #1174 See merge request pleroma/pleroma!1612
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 4 insertions, 0 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"