Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
c567add6
Commit
c567add6
authored
Jun 25, 2017
by
Douglas Cerna
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
parent
f9216656
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletions
+11
-1
cms/envs/aws.py
+4
-0
cms/envs/bok_choy.py
+3
-0
cms/envs/common.py
+4
-0
cms/envs/devstack.py
+0
-1
No files found.
cms/envs/aws.py
View file @
c567add6
...
@@ -106,6 +106,10 @@ if STATIC_URL_BASE:
...
@@ -106,6 +106,10 @@ if STATIC_URL_BASE:
# DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one
# DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one
DEFAULT_COURSE_ABOUT_IMAGE_URL
=
ENV_TOKENS
.
get
(
'DEFAULT_COURSE_ABOUT_IMAGE_URL'
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
)
DEFAULT_COURSE_ABOUT_IMAGE_URL
=
ENV_TOKENS
.
get
(
'DEFAULT_COURSE_ABOUT_IMAGE_URL'
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
)
# MEDIA_ROOT specifies the directory where user-uploaded files are stored.
MEDIA_ROOT
=
ENV_TOKENS
.
get
(
'MEDIA_ROOT'
,
MEDIA_ROOT
)
MEDIA_URL
=
ENV_TOKENS
.
get
(
'MEDIA_URL'
,
MEDIA_URL
)
# GITHUB_REPO_ROOT is the base directory
# GITHUB_REPO_ROOT is the base directory
# for course data
# for course data
GITHUB_REPO_ROOT
=
ENV_TOKENS
.
get
(
'GITHUB_REPO_ROOT'
,
GITHUB_REPO_ROOT
)
GITHUB_REPO_ROOT
=
ENV_TOKENS
.
get
(
'GITHUB_REPO_ROOT'
,
GITHUB_REPO_ROOT
)
...
...
cms/envs/bok_choy.py
View file @
c567add6
...
@@ -64,6 +64,9 @@ STATICFILES_DIRS = [
...
@@ -64,6 +64,9 @@ STATICFILES_DIRS = [
(
TEST_ROOT
/
"staticfiles"
/
"cms"
)
.
abspath
(),
(
TEST_ROOT
/
"staticfiles"
/
"cms"
)
.
abspath
(),
]
]
DEFAULT_FILE_STORAGE
=
'django.core.files.storage.FileSystemStorage'
MEDIA_ROOT
=
TEST_ROOT
/
"uploads"
WEBPACK_LOADER
[
'DEFAULT'
][
'STATS_FILE'
]
=
TEST_ROOT
/
"staticfiles"
/
"cms"
/
"webpack-stats.json"
WEBPACK_LOADER
[
'DEFAULT'
][
'STATS_FILE'
]
=
TEST_ROOT
/
"staticfiles"
/
"cms"
/
"webpack-stats.json"
# Silence noisy logs
# Silence noisy logs
...
...
cms/envs/common.py
View file @
c567add6
...
@@ -61,6 +61,10 @@ from lms.envs.common import (
...
@@ -61,6 +61,10 @@ from lms.envs.common import (
ENABLE_CREDIT_ELIGIBILITY
,
YOUTUBE_API_KEY
,
ENABLE_CREDIT_ELIGIBILITY
,
YOUTUBE_API_KEY
,
COURSE_MODE_DEFAULTS
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
,
COURSE_MODE_DEFAULTS
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
,
# User-uploaded content
MEDIA_ROOT
,
MEDIA_URL
,
# Django REST framework configuration
# Django REST framework configuration
REST_FRAMEWORK
,
REST_FRAMEWORK
,
...
...
cms/envs/devstack.py
View file @
c567add6
...
@@ -10,7 +10,6 @@ from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
...
@@ -10,7 +10,6 @@ from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
del
DEFAULT_FILE_STORAGE
del
DEFAULT_FILE_STORAGE
COURSE_IMPORT_EXPORT_STORAGE
=
'django.core.files.storage.FileSystemStorage'
COURSE_IMPORT_EXPORT_STORAGE
=
'django.core.files.storage.FileSystemStorage'
USER_TASKS_ARTIFACT_STORAGE
=
COURSE_IMPORT_EXPORT_STORAGE
USER_TASKS_ARTIFACT_STORAGE
=
COURSE_IMPORT_EXPORT_STORAGE
MEDIA_ROOT
=
"/edx/var/edxapp/uploads"
DEBUG
=
True
DEBUG
=
True
USE_I18N
=
True
USE_I18N
=
True
...
...
XuYS
@xys
mentioned in commit
582b3f11
Dec 21, 2017
mentioned in commit
582b3f11
mentioned in commit 582b3f11b5d90ad321e5afd396099338a96d7471
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment