Merge branch 'bugfix/s3-configuration' into 'develop'
config: fix up defaults for s3 endpoint configuration See merge request pleroma/pleroma!312
这个提交包含在:
当前提交
340ab3cb90
@ -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"]
|
||||
|
||||
|
正在加载...
在新工单中引用
屏蔽一个用户