Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5120 from edx/pmitros/aws-djpyfs

Browse Source 
AWS settings for XBlocks to have filesystem-like storage
This commit is contained in:
Piotr Mitros
2014-09-08 11:59:23 -04:00
parent 3cf2481e6c 31176aeb37
commit a12c795944
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cms/envs/aws.py
View File

@@ -213,6 +213,16 @@ if FEATURES.get('AUTH_USE_CAS'):
with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
AUTH_TOKENS = json.load(auth_file)
############### XBlock filesystem field config ##########
if 'XBLOCK-FS-STORAGE-BUCKET' in ENV_TOKENS:
DJFS = {
'type' : 's3fs',
'bucket' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-BUCKET', None),
'prefix' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-PREFIX', '/xblock-storage/')
}
DJFS['aws_access_key_id'] = AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None)
DJFS['aws_secret_access_key'] = AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER)
EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)