projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
03ecbe0
)
Merge branch 'bugfix/s3-configuration' into 'develop'
author
kaniini
<nenolod@gmail.com>
Fri, 31 Aug 2018 04:50:44 +0000
(
04:50
+0000)
committer
kaniini
<nenolod@gmail.com>
Fri, 31 Aug 2018 04:50:44 +0000
(
04:50
+0000)
config: fix up defaults for s3 endpoint configuration
See merge request pleroma/pleroma!312
config/config.exs
patch
|
blob
|
history
diff --git
a/config/config.exs
b/config/config.exs
index 20b55086c242d8a1d26a3010ba3f43de51af6a85..e223635196ce5f503c74ef355461f77f908e14e9 100644
(file)
--- 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"]