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
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
2be2b52f
Commit
2be2b52f
authored
8 years ago
by
e0d
Browse files
Options
Downloads
Patches
Plain Diff
apply the setting to the CMS too
parent
ae202dd5
No related branches found
Branches containing commit
Tags
release-2019-11-04-10.15
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/envs/aws.py
+6
-0
6 additions, 0 deletions
cms/envs/aws.py
cms/envs/common.py
+3
-1
3 additions, 1 deletion
cms/envs/common.py
with
9 additions
and
1 deletion
cms/envs/aws.py
+
6
−
0
View file @
2be2b52f
...
...
@@ -168,6 +168,12 @@ if ENV_TOKENS.get('SESSION_COOKIE_NAME', None):
EDXMKTG_LOGGED_IN_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'
EDXMKTG_LOGGED_IN_COOKIE_NAME
'
,
EDXMKTG_LOGGED_IN_COOKIE_NAME
)
EDXMKTG_USER_INFO_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'
EDXMKTG_USER_INFO_COOKIE_NAME
'
,
EDXMKTG_USER_INFO_COOKIE_NAME
)
# Determines whether the CSRF token can be transported on
# unencrypted channels. It is set to False here for backward compatibility,
# but it is highly recommended that this is True for environments accessed
# by end users.
CSRF_COOKIE_SECURE
=
ENV_TOKENS
.
get
(
'
CSRF_COOKIE_SECURE
'
,
False
)
#Email overrides
DEFAULT_FROM_EMAIL
=
ENV_TOKENS
.
get
(
'
DEFAULT_FROM_EMAIL
'
,
DEFAULT_FROM_EMAIL
)
DEFAULT_FEEDBACK_EMAIL
=
ENV_TOKENS
.
get
(
'
DEFAULT_FEEDBACK_EMAIL
'
,
DEFAULT_FEEDBACK_EMAIL
)
...
...
This diff is collapsed.
Click to expand it.
cms/envs/common.py
+
3
−
1
View file @
2be2b52f
...
...
@@ -298,7 +298,9 @@ from lms.envs.common import (
# Forwards-compatibility with Django 1.7
CSRF_COOKIE_AGE
=
60
*
60
*
24
*
7
*
52
# It is highly recommended that you override this in any environment accessed by
# end users
CSRF_COOKIE_SECURE
=
False
#################### CAPA External Code Evaluation #############################
XQUEUE_INTERFACE
=
{
...
...
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