summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-20 14:02:40 +0200
committerlain <lain@soykaf.club>2020-05-20 14:02:40 +0200
commitc7cdc553ff9bd7a068274d9b4b71008d9df04723 (patch)
tree7b66d6b01ea9d0e82ec2b594e4549397230ce145 /config/config.exs
parent0d5bce018df9c99c771daaaa1de3ab0efc0cba5c (diff)
parent423ea497bb2a7225f4f0d0e1ebff93466b3ec124 (diff)
downloadpleroma-c7cdc553ff9bd7a068274d9b4b71008d9df04723.tar.gz
pleroma-c7cdc553ff9bd7a068274d9b4b71008d9df04723.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index c51884f3a..248cf2455 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -183,6 +183,7 @@ config :pleroma, :instance,
email: "example@example.com",
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
+ background_image: "/images/city.jpg",
limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
@@ -376,6 +377,10 @@ config :pleroma, :rich_media,
config :pleroma, :media_proxy,
enabled: false,
+ invalidation: [
+ enabled: false,
+ provider: Pleroma.Web.MediaProxy.Invalidation.Script
+ ],
proxy_opts: [
redirect_on_failure: false,
max_body_length: 25 * 1_048_576,