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

Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs

Browse Source 
Revert "AWS settings for XBlocks to have filesystem-like storage"
This commit is contained in:
Ben Patterson
2014-09-02 11:36:37 -04:00
parent 1abb8de2ba fe85223f73
commit 27c83d51df
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/envs/aws.py
View File

@@ -88,12 +88,6 @@ CELERY_QUEUES = {
with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)
DJFS = {
'type' : 's3fs',
'bucket' : ENV_TOKENS.get('xblock-fs-storage-bucket', None),
'prefix' : ENV_TOKENS.get('xblock-fs-storage-prefix', '')
}
# STATIC_URL_BASE specifies the base url to use for static files
STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None)
if STATIC_URL_BASE:

6
lms/envs/aws.py
View File

@@ -111,12 +111,6 @@ if os.environ.get('QUEUE') == 'high_mem':
with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)
DJFS = {
'type' : 's3fs',
'bucket' : ENV_TOKENS.get('xblock-fs-storage-bucket', None),
'prefix' : ENV_TOKENS.get('xblock-fs-storage-prefix', '')
}
# STATIC_ROOT specifies the directory where static files are
# collected
STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None)