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

settings: Attempt to detect S3_REGION if left blank.

This commit is contained in:
Alex Vandiver 2024-09-16 20:48:13 +00:00 committed by Tim Abbott
parent 9a1f78db22
commit 5bc4d39c25
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zproject/computed_settings.py
View File

@ -52,6 +52,7 @@ from .configured_settings import (
REMOTE_POSTGRES_PORT, REMOTE_POSTGRES_PORT,
REMOTE_POSTGRES_SSLMODE, REMOTE_POSTGRES_SSLMODE,
ROOT_SUBDOMAIN_ALIASES, ROOT_SUBDOMAIN_ALIASES,
S3_REGION,
SENTRY_DSN, SENTRY_DSN,
SOCIAL_AUTH_APPLE_APP_ID, SOCIAL_AUTH_APPLE_APP_ID,
SOCIAL_AUTH_APPLE_SERVICES_ID, SOCIAL_AUTH_APPLE_SERVICES_ID,
@ -511,6 +512,10 @@ ROOT_DOMAIN_URI = EXTERNAL_URI_SCHEME + EXTERNAL_HOST
S3_KEY = get_secret("s3_key") S3_KEY = get_secret("s3_key")
S3_SECRET_KEY = get_secret("s3_secret_key") S3_SECRET_KEY = get_secret("s3_secret_key")
if S3_KEY is not None and S3_SECRET_KEY is not None and S3_REGION is None:
import boto3
S3_REGION = boto3.client("s3").meta.region_name
DROPBOX_APP_KEY = get_secret("dropbox_app_key") DROPBOX_APP_KEY = get_secret("dropbox_app_key")