Browse Source

truncated_namespace should default to nil

groups
Mark Felder 3 years ago
parent
commit
f0ab60189e
3 changed files with 6 additions and 4 deletions
  1. +1
    -1
      config/config.exs
  2. +4
    -2
      lib/pleroma/upload.ex
  3. +1
    -1
      priv/templates/sample_config.eex

+ 1
- 1
config/config.exs View File

@@ -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,


+ 4
- 2
lib/pleroma/upload.ex View File

@@ -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 ->


+ 1
- 1
priv/templates/sample_config.eex View File

@@ -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:


Loading…
Cancel
Save