pleroma

commit: 340ab3cb9068d444b77213e07beb8c2c3ca128b9
parent: 03ecbe045605d04d7ceba2f3b5d16d620d97e8b2
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 31 Aug 2018 04:50:44 +0000

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

config: fix up defaults for s3 endpoint configuration

See merge request pleroma/pleroma!312
Diffstat:
M
config/config.exs
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git 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"]