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, 7 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs
index d234d23eb..4eb59994c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -11,9 +11,13 @@ 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,
+ 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"]