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

Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup

Browse Source 
Clean up conventions for underscores vs. dashes in config setting.
This commit is contained in:
Piotr Mitros
2014-09-15 12:08:20 -04:00
parent 4c3b4a59b4 af12acc904
commit 78ed5c2c54
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cms/envs/aws.py
View File

@@ -214,14 +214,14 @@ 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:
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/')
'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
}
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)

10
lms/envs/aws.py
View File

@@ -299,14 +299,14 @@ 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:
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/')
'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
}
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)
############### Module Store Items ##########
HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = ENV_TOKENS.get('HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS', {})