add overriding truncated_namespace condition for truncating paths for digital ocean

2019-03-24 11:32:09 -07:00 · 2019-03-24 11:32:09 -07:00 · 6c96d68f77
parent 750de7d842
commit 6c96d68f77
1 changed files with 9 additions and 4 deletions
--- a/lib/pleroma/uploaders/s3.ex
+++ b/lib/pleroma/uploaders/s3.ex
@ -13,10 +13,15 @@ def get_file(file) 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,