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
48fe4ad1
Unverified
Commit
48fe4ad1
authored
Mar 01, 2017
by
Brandon DeRosier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set
parent
090fc12b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
lms/envs/aws.py
+5
-1
lms/envs/devstack.py
+1
-0
No files found.
lms/envs/aws.py
View file @
48fe4ad1
...
@@ -176,7 +176,11 @@ EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME',
...
@@ -176,7 +176,11 @@ EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME',
EDXMKTG_USER_INFO_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'EDXMKTG_USER_INFO_COOKIE_NAME'
,
EDXMKTG_USER_INFO_COOKIE_NAME
)
EDXMKTG_USER_INFO_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'EDXMKTG_USER_INFO_COOKIE_NAME'
,
EDXMKTG_USER_INFO_COOKIE_NAME
)
LMS_ROOT_URL
=
ENV_TOKENS
.
get
(
'LMS_ROOT_URL'
)
LMS_ROOT_URL
=
ENV_TOKENS
.
get
(
'LMS_ROOT_URL'
)
ENTERPRISE_API_URL
=
ENV_TOKENS
.
get
(
'ENTERPRISE_API_URL'
,
LMS_ROOT_URL
+
'/enterprise/api/v1/'
)
DEFAULT_ENTERPRISE_API_URL
=
None
if
LMS_ROOT_URL
is
not
None
:
DEFAULT_ENTERPRISE_API_URL
=
LMS_ROOT_URL
+
'/enterprise/api/v1/'
ENTERPRISE_API_URL
=
ENV_TOKENS
.
get
(
'ENTERPRISE_API_URL'
,
DEFAULT_ENTERPRISE_API_URL
)
ENV_FEATURES
=
ENV_TOKENS
.
get
(
'FEATURES'
,
{})
ENV_FEATURES
=
ENV_TOKENS
.
get
(
'FEATURES'
,
{})
for
feature
,
value
in
ENV_FEATURES
.
items
():
for
feature
,
value
in
ENV_FEATURES
.
items
():
...
...
lms/envs/devstack.py
View file @
48fe4ad1
...
@@ -20,6 +20,7 @@ CELERY_ALWAYS_EAGER = True
...
@@ -20,6 +20,7 @@ CELERY_ALWAYS_EAGER = True
HTTPS
=
'off'
HTTPS
=
'off'
LMS_ROOT_URL
=
'http://localhost:8000'
LMS_ROOT_URL
=
'http://localhost:8000'
ENTERPRISE_API_URL
=
LMS_ROOT_URL
+
'/enterprise/api/v1/'
################################ LOGGERS ######################################
################################ LOGGERS ######################################
...
...
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