MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of dev.funkwhale.audio:funkwhale/funkwhale into develop

This commit is contained in:
Eliot Berriot 2020-04-10 12:05:10 +02:00
parent 176bd5053e 667d5daf2b
commit f2a5d29a0b
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/config/settings/common.py
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"

1
changes/changelog.d/s3-custom-domain.enhancement Normal file
View File

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