Commit 27c83d51 by Ben Patterson

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

Revert "AWS settings for XBlocks to have filesystem-like storage"
parents 1abb8de2 fe85223f
......@@ -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:
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment