truncated_namespace should default to nil

diff --git a/config/config.exs b/config/config.exs
index 2a0c6302cb5ca0a866e82ab2d31e227043eddddd..ef3baed9354042a0af90530b945c5514ee2e6423 100644 (file)
--- 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
index e714dc57b6f046c965e188fe95d6e955c21a41bd..e13d40c5a6e8c3c2188faccef7ed2dbb7e35c275 100644 (file)
--- 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
index 0c2477e2cf5f948f4f176fdf0b79c92d16644999..42f496ded4611dc8f0ceaf4e55f32232706bee09 100644 (file)
--- 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: