summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-09-14 16:11:44 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-09-14 16:11:44 +0300
commit6bcedb693c47fcef44ff3b4412629d1c50c2a1c7 (patch)
tree0420581ba993b70cb957c261cb83ef90597ddeb4 /config/config.exs
parentc3f00447afc67b460e63b531e4f2432bfaa37bdb (diff)
parenta9b78f55e3561eec3cd125f030d2dd6ec338d406 (diff)
downloadpleroma-6bcedb693c47fcef44ff3b4412629d1c50c2a1c7.tar.gz
pleroma-6bcedb693c47fcef44ff3b4412629d1c50c2a1c7.zip
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts: # docs/config.md # mix.lock
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index b742a650d..ab6e00c98 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -391,6 +391,8 @@ config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
+config :phoenix, :json_library, Jason
+
config :pleroma, :gopher,
enabled: false,
ip: {0, 0, 0, 0},
@@ -583,6 +585,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"