Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, April 9th
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
05d7592e
Commit
05d7592e
authored
5 years ago
by
Braden MacDonald
Browse files
Options
Downloads
Patches
Plain Diff
Read CMS_BASE from the environment, define it explicitly as public host
parent
5bf2a258
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/envs/common.py
+1
-0
1 addition, 0 deletions
cms/envs/common.py
cms/envs/production.py
+3
-1
3 additions, 1 deletion
cms/envs/production.py
with
4 additions
and
1 deletion
cms/envs/common.py
+
1
−
0
View file @
05d7592e
...
...
@@ -504,6 +504,7 @@ FRONTEND_LOGIN_URL = LOGIN_URL
FRONTEND_LOGOUT_URL
=
lambda
settings
:
settings
.
LMS_ROOT_URL
+
'
/logout
'
derived
(
'
FRONTEND_LOGOUT_URL
'
)
# Public domain name of Studio (should be resolvable from the end-user's browser)
CMS_BASE
=
'
localhost:18010
'
LOG_DIR
=
'
/edx/var/log/edx
'
...
...
This diff is collapsed.
Click to expand it.
cms/envs/production.py
+
3
−
1
View file @
05d7592e
...
...
@@ -162,6 +162,8 @@ EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', EMAIL_HOST)
EMAIL_PORT
=
ENV_TOKENS
.
get
(
'
EMAIL_PORT
'
,
EMAIL_PORT
)
EMAIL_USE_TLS
=
ENV_TOKENS
.
get
(
'
EMAIL_USE_TLS
'
,
EMAIL_USE_TLS
)
# CMS_BASE: Public domain name of Studio (should be resolvable from the end-user's browser)
CMS_BASE
=
ENV_TOKENS
.
get
(
'
CMS_BASE
'
)
LMS_BASE
=
ENV_TOKENS
.
get
(
'
LMS_BASE
'
)
LMS_ROOT_URL
=
ENV_TOKENS
.
get
(
'
LMS_ROOT_URL
'
)
LMS_INTERNAL_ROOT_URL
=
ENV_TOKENS
.
get
(
'
LMS_INTERNAL_ROOT_URL
'
,
LMS_ROOT_URL
)
...
...
@@ -180,7 +182,7 @@ SITE_NAME = ENV_TOKENS['SITE_NAME']
ALLOWED_HOSTS
=
[
# TODO: bbeggs remove this before prod, temp fix to get load testing running
"
*
"
,
ENV_TOKENS
.
get
(
'
CMS_BASE
'
)
CMS_BASE
,
]
LOG_DIR
=
ENV_TOKENS
[
'
LOG_DIR
'
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment