pleroma

commit: f0ab60189e0749ca207b483b291c90f892dce6a3
parent 67e888498c16c8bba434afe91cb3e0a83b9da8bb
Author: Mark Felder <feld@feld.me>
Date:   Wed, 13 Jan 2021 11:54:00 -0600

truncated_namespace should default to nil

Diffstat:
M
config/config.exs
2
+-
M
lib/pleroma/upload.ex
6
++++--
M
priv/templates/sample_config.eex
2
+-

3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -72,7 +72,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
   bucket_namespace: nil,
-  truncated_namespace: false,
+  truncated_namespace: nil,
   streaming_enabled: true
 
 config :ex_aws, :s3,
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
@@ -229,13 +229,15 @@ defmodule Pleroma.Upload do
 
       Pleroma.Uploaders.S3 ->
         bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
+        truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace])
+        namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace])
 
         bucket_with_namespace =
           cond do
-            truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace]) ->
+            !is_nil(truncated_namespace) ->
               truncated_namespace
 
-            namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace]) ->
+            !is_nil(namespace) ->
               namespace <> ":" <> bucket
 
             true ->
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
@@ -59,7 +59,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
 # config :pleroma, Pleroma.Uploaders.S3,
 #   bucket: "some-bucket",
 #   bucket_namespace: "my-namespace",
-#   truncated_namespace: false,
+#   truncated_namespace: nil,
 #   streaming_enabled: true
 #
 # Configure S3 credentials: