Merge branch 'u1-liquid-develop-patch-79380' into 'develop'

Add support custom domain for S3 storage

See merge request funkwhale/funkwhale!1086
This commit is contained in:
Agate 2020-04-10 09:39:22 +02:00
commit 667d5daf2b
2 changed files with 2 additions and 0 deletions

View File

@ -388,6 +388,7 @@ if AWS_ACCESS_KEY_ID:
AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY")
AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME")
AWS_S3_CUSTOM_DOMAIN = env("AWS_S3_CUSTOM_DOMAIN", default=None)
AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL", default=None)
AWS_S3_REGION_NAME = env("AWS_S3_REGION_NAME", default=None)
AWS_S3_SIGNATURE_VERSION = "s3v4"

View File

@ -0,0 +1 @@
Add support custom domain for S3 storage