diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-25 02:25:59 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-25 02:25:59 +0000 |
| commit | bc14c98de115d8695d3436d1f093f4c161ceb3b2 (patch) | |
| tree | 0b1a2fe30482f3463a866cfbd23b1198573a0654 | |
| parent | 63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b (diff) | |
| parent | 6c96d68f7715b7ce8f55ad7c880abeeabc2567d8 (diff) | |
| download | pleroma-bc14c98de115d8695d3436d1f093f4c161ceb3b2.tar.gz pleroma-bc14c98de115d8695d3436d1f093f4c161ceb3b2.zip | |
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
| -rw-r--r-- | lib/pleroma/uploaders/s3.ex | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex index e7de3f3e0..521daa93b 100644 --- a/lib/pleroma/uploaders/s3.ex +++ b/lib/pleroma/uploaders/s3.ex @@ -13,10 +13,15 @@ defmodule Pleroma.Uploaders.S3 do bucket = Keyword.fetch!(config, :bucket) bucket_with_namespace = - if namespace = Keyword.get(config, :bucket_namespace) do - namespace <> ":" <> bucket - else - bucket + cond do + truncated_namespace = Keyword.get(config, :truncated_namespace) -> + truncated_namespace + + namespace = Keyword.get(config, :bucket_namespace) -> + namespace <> ":" <> bucket + + true -> + bucket end {:ok, |