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
67f8d488
Commit
67f8d488
authored
Jul 11, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #367 from edx/jarv/gce-email-backend
adding option for file based backend
parents
11fa4586
5b16fbe3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
cms/envs/aws.py
+2
-0
lms/envs/aws.py
+2
-0
No files found.
cms/envs/aws.py
View file @
67f8d488
...
@@ -80,6 +80,8 @@ CELERY_QUEUES = {
...
@@ -80,6 +80,8 @@ CELERY_QUEUES = {
with
open
(
ENV_ROOT
/
CONFIG_PREFIX
+
"env.json"
)
as
env_file
:
with
open
(
ENV_ROOT
/
CONFIG_PREFIX
+
"env.json"
)
as
env_file
:
ENV_TOKENS
=
json
.
load
(
env_file
)
ENV_TOKENS
=
json
.
load
(
env_file
)
EMAIL_BACKEND
=
ENV_TOKENS
.
get
(
'EMAIL_BACKEND'
,
EMAIL_BACKEND
)
EMAIL_FILE_PATH
=
ENV_TOKENS
.
get
(
'EMAIL_FILE_PATH'
,
None
)
LMS_BASE
=
ENV_TOKENS
.
get
(
'LMS_BASE'
)
LMS_BASE
=
ENV_TOKENS
.
get
(
'LMS_BASE'
)
# Note that MITX_FEATURES['PREVIEW_LMS_BASE'] gets read in from the environment file.
# Note that MITX_FEATURES['PREVIEW_LMS_BASE'] gets read in from the environment file.
...
...
lms/envs/aws.py
View file @
67f8d488
...
@@ -100,6 +100,8 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
...
@@ -100,6 +100,8 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS
=
json
.
load
(
env_file
)
ENV_TOKENS
=
json
.
load
(
env_file
)
PLATFORM_NAME
=
ENV_TOKENS
.
get
(
'PLATFORM_NAME'
,
PLATFORM_NAME
)
PLATFORM_NAME
=
ENV_TOKENS
.
get
(
'PLATFORM_NAME'
,
PLATFORM_NAME
)
EMAIL_BACKEND
=
ENV_TOKENS
.
get
(
'EMAIL_BACKEND'
,
EMAIL_BACKEND
)
EMAIL_FILE_PATH
=
ENV_TOKENS
.
get
(
'EMAIL_FILE_PATH'
,
None
)
SITE_NAME
=
ENV_TOKENS
[
'SITE_NAME'
]
SITE_NAME
=
ENV_TOKENS
[
'SITE_NAME'
]
SESSION_COOKIE_DOMAIN
=
ENV_TOKENS
.
get
(
'SESSION_COOKIE_DOMAIN'
)
SESSION_COOKIE_DOMAIN
=
ENV_TOKENS
.
get
(
'SESSION_COOKIE_DOMAIN'
)
...
...
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