diff options
| author | Austin Lanari <austin@jumanji.io> | 2019-03-24 11:32:09 -0700 |
|---|---|---|
| committer | Austin Lanari <austin@jumanji.io> | 2019-03-24 11:32:09 -0700 |
| commit | 6c96d68f7715b7ce8f55ad7c880abeeabc2567d8 (patch) | |
| tree | 7672a84e97a45fe2a7e1fcc36329709847f092a3 /lib | |
| parent | 750de7d84272c050ce7158f9c51dfe6d9823e81c (diff) | |
| download | pleroma-6c96d68f7715b7ce8f55ad7c880abeeabc2567d8.tar.gz | |
add overriding truncated_namespace condition for truncating paths for digital ocean
Diffstat (limited to 'lib')
| -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, |