commit: 4a278cd80a02fa1882db17397bb97b155c76570e
parent: abb349bde0d79cecf98898e82fbda746231c5373
Author: kaniini <nenolod@gmail.com>
Date: Wed, 23 Jan 2019 13:25:04 +0000
Merge branch 's3-namespace' into 'develop'
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
Diffstat:
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex
@@ -9,12 +9,20 @@ defmodule Pleroma.Uploaders.S3 do
# The file name is re-encoded with S3's constraints here to comply with previous links with less strict filenames
def get_file(file) do
config = Pleroma.Config.get([__MODULE__])
+ bucket = Keyword.fetch!(config, :bucket)
+
+ bucket_with_namespace =
+ if namespace = Keyword.get(config, :bucket_namespace) do
+ namespace <> ":" <> bucket
+ else
+ bucket
+ end
{:ok,
{:url,
Path.join([
Keyword.fetch!(config, :public_endpoint),
- Keyword.fetch!(config, :bucket),
+ bucket_with_namespace,
strict_encode(URI.decode(file))
])}}
end