diff options
| author | lain <lain@soykaf.club> | 2020-06-23 10:17:12 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-23 10:17:12 +0200 |
| commit | 2c603f20098d7f342e1cbad8e6a6c86b007c5a99 (patch) | |
| tree | dd9a339daed6a25e758167413d9231e22ce42ac4 /config/config.exs | |
| parent | b05f795326b77edd881ffea2c004d7ca0ddd7df9 (diff) | |
| parent | 3875a507d4b52df7edbda376d3ed31ad52241ac5 (diff) | |
| download | pleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.tar.gz pleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 6a7bb9e06..e0888fa9a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -186,6 +186,7 @@ config :pleroma, :instance, notify_email: "noreply@example.com", description: "Pleroma: An efficient and flexible fediverse server", background_image: "/images/city.jpg", + instance_thumbnail: "/instance/thumbnail.jpeg", limit: 5_000, chat_limit: 5_000, remote_limit: 100_000, @@ -407,6 +408,13 @@ config :pleroma, :media_proxy, ], whitelist: [] +config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, + method: :purge, + headers: [], + options: [] + +config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil + config :pleroma, :chat, enabled: true config :phoenix, :format_encoders, json: Jason |