novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix #565: store media files in S3 bucket

Browse source
This commit is contained in:
Eliot Berriot 2019-04-23 18:00:00 +02:00
commit 101ae27885
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
14 changed files with 212 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/config/settings/common.py
View file

@ -306,6 +306,28 @@ STATIC_ROOT = env("STATIC_ROOT", default=str(ROOT_DIR("staticfiles")))
STATIC_URL = env("STATIC_URL", default="/staticfiles/")
DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIFileSystemStorage"
AWS_DEFAULT_ACL = None
AWS_QUERYSTRING_AUTH = False
# MINIO_ACCESS_KEY_ID = env("MINIO_ACCESS_KEY_ID", default=None)
# if MINIO_ACCESS_KEY_ID:
# AWS_ACCESS_KEY_ID = MINIO_ACCESS_KEY_ID
# AWS_SECRET_ACCESS_KEY = env("MINIO_SECRET_KEY")
# AWS_STORAGE_BUCKET_NAME = env("MINIO_STORAGE_BUCKET_NAME")
# AWS_S3_ENDPOINT_URL = env("MINIO_URL")
# AWS_LOCATION = env("MINIO_BUCKET_DIRECTORY", default="")
# DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID", default=None)
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_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL", default=None)
AWS_LOCATION = env("AWS_LOCATION", default="")
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS = (str(APPS_DIR.path("static")),)