aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-08-31 04:43:15 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-08-31 04:43:15 +0000
commitde5bd6fc65d478b9d3ff9b6f875cb20cc2e411d9 (patch)
treed256ed7f65cc51faf86c3e220ff986ca3e81058e
parent03ecbe045605d04d7ceba2f3b5d16d620d97e8b2 (diff)
downloadpleroma-de5bd6fc65d478b9d3ff9b6f875cb20cc2e411d9.tar.gz
config: fix up defaults for s3 endpoint configuration
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 20b55086c..e22363519 100644
--- 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"]