Merge branch 'bugfix/s3-configuration' into 'develop'

config: fix up defaults for s3 endpoint configuration See merge request pleroma/pleroma!312
6 years ago · 340ab3cb90
parent 03ecbe0456 de5bd6fc65
commit 340ab3cb90
1 changed files with 3 additions and 1 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -16,7 +16,9 @@ config :pleroma, Pleroma.Upload,

 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"

-config :pleroma, Pleroma.Uploaders.S3, s3_bucket: nil
+config :pleroma, Pleroma.Uploaders.S3,
+  bucket: nil,
+  public_endpoint: "https://s3.amazonaws.com"

 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]