diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:49:04 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:49:04 +0000 |
| commit | 84808e1697c3b557e4a01104389e78c63cb53528 (patch) | |
| tree | 7f06092a81cabcceb6c02cf5698c1ca4bd6d8754 /docs | |
| parent | 409bcad54b5de631536761952faed05ad5fe3b99 (diff) | |
| parent | 708e7f09423eb28c97a8007b9b11bb7b94c9e296 (diff) | |
| download | pleroma-84808e1697c3b557e4a01104389e78c63cb53528.tar.gz | |
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/config.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index 703ef67dd..55311b76d 100644 --- a/docs/config.md +++ b/docs/config.md @@ -18,6 +18,7 @@ Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`. ## Pleroma.Uploaders.S3 * `bucket`: S3 bucket name +* `bucket_namespace`: S3 bucket namespace * `public_endpoint`: S3 endpoint that the user finally accesses(ex. "https://s3.dualstack.ap-northeast-1.amazonaws.com") * `truncated_namespace`: If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or "" etc. For example, when using CDN to S3 virtual host format, set "". |