pleroma

commit: bc14c98de115d8695d3436d1f093f4c161ceb3b2
parent: 63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 25 Mar 2019 02:25:59 +0000

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
Diffstat:
M
lib/pleroma/uploaders/s3.ex
13
+++++++++----

1 file changed, 9 insertions(+), 4 deletions(-)
diff --git 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,