From 573d3c89fc62df85dd52eeb435c728885a812af4 Mon Sep 17 00:00:00 2001
From: Stephen Sanchez <steve@edx.org>
Date: Fri, 27 Jun 2014 11:28:11 -0400
Subject: [PATCH] Updating settings and requirements for lms and cms to support
 file upload

---
 cms/envs/common.py | 1 +
 lms/envs/aws.py    | 3 +++
 lms/envs/common.py | 1 +
 3 files changed, 5 insertions(+)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 4bd842da47..df53ca4839 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -605,6 +605,7 @@ OPTIONAL_APPS = (
     'submissions',
     'openassessment',
     'openassessment.assessment',
+    'openassessment.fileupload',
     'openassessment.workflow',
     'openassessment.xblock'
 )
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index bd5ee9e0e8..410441d94d 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -312,6 +312,9 @@ if AWS_SECRET_ACCESS_KEY == "":
 
 AWS_STORAGE_BUCKET_NAME = AUTH_TOKENS.get('AWS_STORAGE_BUCKET_NAME', 'edxuploads')
 
+# Specific setting for the File Upload Service to store media in a bucket.
+FILE_UPLOAD_STORAGE_BUCKET_NAME = AUTH_TOKENS.get('AWS_STORAGE_BUCKET_NAME', 'edxuploads')
+
 # If there is a database called 'read_replica', you can use the use_read_replica_if_available
 # function in util/query.py, which is useful for very large database reads
 DATABASES = AUTH_TOKENS['DATABASES']
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 7718ada4ca..f5a189fb94 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1602,6 +1602,7 @@ OPTIONAL_APPS = (
     'submissions',
     'openassessment',
     'openassessment.assessment',
+    'openassessment.fileupload',
     'openassessment.workflow',
     'openassessment.xblock'
 )