diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:46:26 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:46:26 +0000 |
| commit | 5aa62b8581b1fb13a1d799906d6a7fe8e68c35ba (patch) | |
| tree | 07bbb6db310e80947896bc72ce67e89e75500793 /docs | |
| parent | 390329a303dd6d6a91d0bafa7dff0f7d63a8dad5 (diff) | |
| parent | 11d08c2de0226caed8119bb3a45a8e0ab8791fbe (diff) | |
| download | pleroma-5aa62b8581b1fb13a1d799906d6a7fe8e68c35ba.tar.gz | |
Merge branch 'test/pleroma_uploaders' into 'develop'
tests for Pleroma.Uploaders
See merge request pleroma/pleroma!1543
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 "". |