diff options
| author | Mark Felder <feld@feld.me> | 2021-01-13 11:54:00 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-13 11:54:00 -0600 |
| commit | f0ab60189e0749ca207b483b291c90f892dce6a3 (patch) | |
| tree | 8b2606258158c859c5bec56f6c11a7f6490d739e /lib/pleroma/upload.ex | |
| parent | 67e888498c16c8bba434afe91cb3e0a83b9da8bb (diff) | |
| download | pleroma-f0ab60189e0749ca207b483b291c90f892dce6a3.tar.gz | |
truncated_namespace should default to nil
Diffstat (limited to 'lib/pleroma/upload.ex')
| -rw-r--r-- | lib/pleroma/upload.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index e714dc57b..e13d40c5a 100644 --- 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 -> |