Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
feld
pleroma
Commits
de5bd6fc
Commit
de5bd6fc
authored
Aug 31, 2018
by
kaniini
Browse files
config: fix up defaults for s3 endpoint configuration
parent
03ecbe04
Changes
1
Hide whitespace changes
Inline
Side-by-side
config/config.exs
View file @
de5bd6fc
...
@@ -16,7 +16,9 @@ config :pleroma, Pleroma.Upload,
...
@@ -16,7 +16,9 @@ config :pleroma, Pleroma.Upload,
config
:pleroma
,
Pleroma
.
Uploaders
.
Local
,
uploads:
"uploads"
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"
]
config
:pleroma
,
:emoji
,
shortcode_globs:
[
"/emoji/custom/**/*.png"
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment