Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow configuring the S3 buckets for static files as well

Roland Geider6b4240871196
diff --git a/settings/main.py b/settings/main.py
index d2c21cf14..31d8f8e63 100644
--- a/settings/main.py
+++ b/settings/main.py
@@ -283,7 +283,9 @@ STORAGES = {
# S3 object storage config
# See https://wger.readthedocs.io/en/latest/production/docker.html#s3-object-storage
#
-if env.bool('USE_S3_MEDIA_FILES', False):
+USE_S3_MEDIA_FILES = env.bool('USE_S3_MEDIA_FILES', False)
+USE_S3_STATIC_FILES = env.bool('USE_S3_STATIC_FILES', False)
+if USE_S3_MEDIA_FILES or USE_S3_STATIC_FILES:
AWS_ACCESS_KEY_ID = env.str('AWS_ACCESS_KEY_ID')
AWS_SECRET_ACCESS_KEY = env.str('AWS_SECRET_ACCESS_KEY')
AWS_STORAGE_BUCKET_NAME = env.str('AWS_STORAGE_BUCKET_NAME')
@@ -298,7 +300,23 @@ if env.bool('USE_S3_MEDIA_FILES', False):
f'{AWS_STORAGE_BUCKET_NAME}.{AWS_S3_REGION_NAME}.{AWS_S3_DOMAIN}',
)
AWS_QUERYSTRING_AUTH = False
- STORAGES['default']['BACKEND'] = 'storages.backends.s3boto3.S3Boto3Storage'
- if env.bool('USE_S3_URL_FOR_MEDIA', True):
- MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/'
+ if USE_S3_MEDIA_FILES:
+ STORAGES['default'] = {
+ 'BACKEND': 'storages.backends.s3boto3.S3Boto3Storage',
+ 'OPTIONS': {
+ 'location': env.str('S3_MEDIA_FILES_LOCATION', 'media'),
+ },
+ }
+ if env.bool('USE_S3_URL_FOR_MEDIA', True):
+ MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/'
+
+ if USE_S3_STATIC_FILES:
+ STORAGES['staticfiles'] = {
+ 'BACKEND': 'storages.backends.s3boto3.S3Boto3Storage',
+ 'OPTIONS': {
+ 'location': env.str('S3_STATIC_FILES_LOCATION', 'static'),
+ },
+ }
+ if env.bool('USE_S3_URL_FOR_STATIC', True):
+ STATIC_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/'