summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs10
1 files changed, 6 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index d234d23eb..fa36209ac 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -11,10 +11,12 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Upload,
- uploads: "uploads",
- strip_exif: false,
- use_s3: false,
- s3_bucket: nil
+ uploader: Pleroma.Uploaders.Local,
+ strip_exif: false
+
+config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
+
+config :pleroma, Pleroma.Uploaders.S3, s3_bucket: nil
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]