moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
kaniini 2019-03-25 02:25:59 +00:00
parent 63ffa4842c 6c96d68f77
commit bc14c98de1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pleroma/uploaders/s3.ex
View File

@ -13,9 +13,14 @@ def get_file(file) do
bucket = Keyword.fetch!(config, :bucket) bucket = Keyword.fetch!(config, :bucket)
bucket_with_namespace = bucket_with_namespace =
if namespace = Keyword.get(config, :bucket_namespace) do cond do
truncated_namespace = Keyword.get(config, :truncated_namespace) ->
truncated_namespace
namespace = Keyword.get(config, :bucket_namespace) ->
namespace <> ":" <> bucket namespace <> ":" <> bucket
else
true ->
bucket bucket
end end