squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add overriding truncated_namespace condition for truncating paths for digital ocean

Browse Source
This commit is contained in:
Austin Lanari 2019-03-24 11:32:09 -07:00
parent 750de7d842
commit 6c96d68f77
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,15 @@ defmodule Pleroma.Uploaders.S3 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
namespace <> ":" <> bucket truncated_namespace = Keyword.get(config, :truncated_namespace) ->
else truncated_namespace
bucket
namespace = Keyword.get(config, :bucket_namespace) ->
namespace <> ":" <> bucket
true ->
bucket
end end
{:ok, {:ok,