Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

thumbor: Respect S3_ENDPOINT_URL setting. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-12-15 16:07:08 -08:00
parent 10559c05ee
commit 8a9f612def
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zthumbor/thumbor_settings.py
View File

@ -655,9 +655,10 @@ RESULT_STORAGE_STORES_UNSAFE = True
################################### AWS S3 settings ############################ ################################### AWS S3 settings ############################
if not IS_LOCAL_STORAGE: if not IS_LOCAL_STORAGE:
from zproject.configured_settings import S3_AUTH_UPLOADS_BUCKET, S3_REGION from zproject.configured_settings import S3_AUTH_UPLOADS_BUCKET, S3_ENDPOINT_URL, S3_REGION
TC_AWS_REGION = S3_REGION # AWS Region TC_AWS_REGION = S3_REGION # AWS Region
TC_AWS_ENDPOINT = S3_ENDPOINT_URL
TC_AWS_STORAGE_BUCKET = S3_AUTH_UPLOADS_BUCKET # S3 bucket for Storage TC_AWS_STORAGE_BUCKET = S3_AUTH_UPLOADS_BUCKET # S3 bucket for Storage
TC_AWS_STORAGE_ROOT_PATH = 'thumbnails' # S3 path prefix for Storage bucket TC_AWS_STORAGE_ROOT_PATH = 'thumbnails' # S3 path prefix for Storage bucket