diff options
| author | feld <feld@feld.me> | 2021-01-20 22:48:48 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-20 22:48:48 +0000 |
| commit | 2926713fe5c36b8fc64bcce13ca16bc12eaff96c (patch) | |
| tree | 7c0acf2b0843fdd6d4ec380eeb98f62ee12ee7cc /config/description.exs | |
| parent | 2905df841bb820c0016782483567beef68252f89 (diff) | |
| parent | 086100e3b7cad827c0f377fdcc4ae9d3b66327c7 (diff) | |
| download | pleroma-2926713fe5c36b8fc64bcce13ca16bc12eaff96c.tar.gz pleroma-2926713fe5c36b8fc64bcce13ca16bc12eaff96c.zip | |
Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/config/description.exs b/config/description.exs index f438a88ab..493d362d3 100644 --- a/config/description.exs +++ b/config/description.exs @@ -150,17 +150,11 @@ config :pleroma, :config_description, [ suggestions: ["pleroma"] }, %{ - key: :public_endpoint, - type: :string, - description: "S3 endpoint", - suggestions: ["https://s3.amazonaws.com"] - }, - %{ key: :truncated_namespace, type: :string, description: "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 \"\". At this time, write CNAME to CDN in public_endpoint." + " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in Upload base_url." }, %{ key: :streaming_enabled, |