moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

config: fix up defaults for s3 endpoint configuration

See merge request pleroma/pleroma!312
This commit is contained in:
kaniini 2018-08-31 04:50:44 +00:00
parent 03ecbe0456 de5bd6fc65
commit 340ab3cb90
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.exs
View File

@ -16,7 +16,9 @@
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"]