X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=a6be69620e9e2ca00314b94accfb977b39764ad5;hb=4fab4e9ba44cdedccb9cf92a0d9b590a654bba69;hp=225ca914a8ff5299f2fd640285e802c497258697;hpb=3e79d941c81e741c1268523db23a9024ca67bd29;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 225ca914a..a6be69620 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -20,7 +20,8 @@ config :pleroma, Pleroma.Uploaders.Local,
 
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
-  public_endpoint: "https://s3.amazonaws.com"
+  public_endpoint: "https://s3.amazonaws.com",
+  force_media_proxy: false
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
@@ -84,6 +85,9 @@ config :pleroma, :instance,
   description: "A Pleroma instance, an alternative fediverse server",
   limit: 5000,
   upload_limit: 16_000_000,
+  avatar_upload_limit: 2_000_000,
+  background_upload_limit: 4_000_000,
+  banner_upload_limit: 4_000_000,
   registrations_open: true,
   federating: true,
   allow_relay: true,
@@ -96,6 +100,7 @@ config :pleroma, :instance,
     "text/html",
     "text/markdown"
   ],
+  finmoji_enabled: true,
   mrf_transparency: true
 
 config :pleroma, :markup,