Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
6c3de222
Commit
6c3de222
authored
11 years ago
by
Jason Bau
Browse files
Options
Downloads
Plain Diff
Merge pull request #450 from edx/jbau/configure-session
Allow session backend to be configurable
parents
679b118e
034de2cf
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/envs/aws.py
+5
-0
5 additions, 0 deletions
cms/envs/aws.py
lms/envs/aws.py
+1
-1
1 addition, 1 deletion
lms/envs/aws.py
with
6 additions
and
1 deletion
cms/envs/aws.py
+
5
−
0
View file @
6c3de222
...
...
@@ -92,6 +92,7 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
CACHES
=
ENV_TOKENS
[
'
CACHES
'
]
SESSION_COOKIE_DOMAIN
=
ENV_TOKENS
.
get
(
'
SESSION_COOKIE_DOMAIN
'
)
SESSION_ENGINE
=
ENV_TOKENS
.
get
(
'
SESSION_ENGINE
'
,
SESSION_ENGINE
)
# allow for environments to specify what cookie name our login subsystem should use
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
...
...
@@ -122,6 +123,10 @@ LOGGING = get_logger_config(LOG_DIR,
debug
=
False
,
service_variant
=
SERVICE_VARIANT
)
#theming start:
PLATFORM_NAME
=
ENV_TOKENS
.
get
(
'
PLATFORM_NAME
'
,
'
edX
'
)
################ SECURE AUTH ITEMS ###############################
# Secret things: passwords, access keys, etc.
with
open
(
ENV_ROOT
/
CONFIG_PREFIX
+
"
auth.json
"
)
as
auth_file
:
...
...
This diff is collapsed.
Click to expand it.
lms/envs/aws.py
+
1
−
1
View file @
6c3de222
...
...
@@ -102,8 +102,8 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
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
'
]
SESSION_ENGINE
=
ENV_TOKENS
.
get
(
'
SESSION_ENGINE
'
,
SESSION_ENGINE
)
SESSION_COOKIE_DOMAIN
=
ENV_TOKENS
.
get
(
'
SESSION_COOKIE_DOMAIN
'
)
# allow for environments to specify what cookie name our login subsystem should use
...
...
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