paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

tusd: Use default already set in computed_settings.

Browse Source 
Having an additional fallback here is not necessary.
This commit is contained in:
Alex Vandiver
2025-04-10 14:48:00 +00:00
committed by Tim Abbott
parent ba5d1108c0
commit 33339f89c3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/management/commands/runtusd.py
View File

@@ -71,10 +71,6 @@ class Command(BaseCommand):
env_vars["AWS_ACCESS_KEY_ID"] = settings.S3_KEY env_vars["AWS_ACCESS_KEY_ID"] = settings.S3_KEY
if settings.S3_SECRET_KEY is not None: if settings.S3_SECRET_KEY is not None:
env_vars["AWS_SECRET_ACCESS_KEY"] = settings.S3_SECRET_KEY env_vars["AWS_SECRET_ACCESS_KEY"] = settings.S3_SECRET_KEY
if settings.S3_REGION is None: if settings.S3_REGION is not None:
import boto3
env_vars["AWS_REGION"] = boto3.client("s3").meta.region_name
else:
env_vars["AWS_REGION"] = settings.S3_REGION env_vars["AWS_REGION"] = settings.S3_REGION
os.execvpe("tusd", tusd_args, env_vars) os.execvpe("tusd", tusd_args, env_vars)