From e654036d546d88ac2f2a1615747b213e2d44c694 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 3 Jan 2020 11:16:03 -0500 Subject: [PATCH] Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Storage to be correctly configured --- cms/envs/production.py | 6 ++++++ lms/envs/production.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cms/envs/production.py b/cms/envs/production.py index b4604bf34e..a2228bf117 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -214,6 +214,12 @@ if 'staticfiles' in CACHES: # managed by the yaml file contents STATICFILES_STORAGE = os.environ.get('STATICFILES_STORAGE', ENV_TOKENS.get('STATICFILES_STORAGE', STATICFILES_STORAGE)) +# Load all AWS_ prefixed variables to allow an S3Boto3Storage to be configured +_locals = locals() +for key, value in ENV_TOKENS.items(): + if key.startswith('AWS_'): + _locals[key] = value + SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') SESSION_COOKIE_HTTPONLY = ENV_TOKENS.get('SESSION_COOKIE_HTTPONLY', True) SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) diff --git a/lms/envs/production.py b/lms/envs/production.py index 8292f1a66e..4fe8e2b9ff 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -250,6 +250,12 @@ if 'staticfiles' in CACHES: # managed by the yaml file contents STATICFILES_STORAGE = os.environ.get('STATICFILES_STORAGE', ENV_TOKENS.get('STATICFILES_STORAGE', STATICFILES_STORAGE)) +# Load all AWS_ prefixed variables to allow an S3Boto3Storage to be configured +_locals = locals() +for key, value in ENV_TOKENS.items(): + if key.startswith('AWS_'): + _locals[key] = value + # Email overrides DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL) DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL)